Gil Dobjanschi
bbced1b9e9
Merge "Transition invalidation bug fix."
2010-11-12 15:39:16 -08:00
James Dong
a9d02bf602
Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h"
2010-11-12 15:33:41 -08:00
Gil Dobjanschi
75159247d8
Transition invalidation bug fix.
...
Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
2010-11-12 15:29:57 -08:00
Jean-Michel Trivi
1a22bdb01a
Add support for audio recording source in generic audio policy mgr.
...
Update the platform-independent audio policy manager to pass the
nature of the audio recording source to the audio policy client
interface through the AudioPolicyClientInterface::setParameters()
method.
Change-Id: I6b4fd0f8a3acea0d7d30bbad98edd1977dc012bf
2010-11-12 14:35:52 -08:00
James Dong
aac193cf38
Separate the key for audio sampling rate and video frame rate in MetaData.h
...
Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
2010-11-11 22:11:20 -08:00
Gil Dobjanschi
0bf3075241
Merge "Invalidate transitions when an image media item duration changes."
2010-11-11 19:09:25 -08:00
Andreas Huber
3de594d370
Increase the prefetcher's low water mark so it restarts fetching data earlier.
...
720p high bitrate content pretty much requires this.
Change-Id: I2cb29d1fa2e3c511f1b88a106a02c53c68a10f2f
2010-11-11 17:01:43 -08:00
Andreas Huber
dcdb6d001d
Merge "Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun."
2010-11-11 15:45:04 -08:00
Andreas Huber
10b920cd99
Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun.
...
Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3
Conflicts:
media/libstagefright/AwesomePlayer.cpp
2010-11-11 15:37:17 -08:00
James Dong
d781089731
Add color format query support to QueryCodecs()
...
Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
2010-11-11 14:08:52 -08:00
James Dong
798a9d2eb1
Merge "Fix memory leak when 0-memcpy quirk is used"
2010-11-11 14:06:30 -08:00
Mike Lockwood
5c7d5ae094
Merge "MediaFile: Recognize MPG file extension as MPEG video"
2010-11-11 13:15:57 -08:00
Mike Lockwood
28d1a4aaf3
MediaFile: Recognize MPG file extension as MPEG video
...
Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-11 16:14:19 -05:00
Gil Dobjanschi
34fad15699
Invalidate transitions when an image media item duration changes.
...
Change-Id: I3cff920ef629df49dcfcb63065afeeb47a649287
2010-11-11 11:55:19 -08:00
James Dong
31b9375f45
Fix memory leak when 0-memcpy quirk is used
...
o minor change to the original patch by Andreas:
call restorePatchedDataPointer() method only if kAvoidMemcopyInputRecordingFrames is turned on
Change-Id: Idf3710e6f759d37d28e866613f98d39215722cb9
2010-11-11 11:26:16 -08:00
James Dong
0fbb7a601f
Merge "Fix testWAVSeekToEnd() testcase"
2010-11-11 09:58:44 -08:00
Mike Lockwood
f0c3a99cee
Merge "MTP: Add missing call to closedir() in recursive delete code"
2010-11-11 08:44:19 -08:00
Mike Lockwood
a108b2fdc1
MTP: Add missing call to closedir() in recursive delete code
...
BUG: 3185660
Change-Id: I3744d2cb193829d20a689af2aea50e8516779631
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-11 11:22:32 -05:00
James Dong
c5d4730ed1
Fix testWAVSeekToEnd() testcase
...
The testcase does not depend on the availability of WMV decoder
Change-Id: I983f6d5954242a28fb9818fa03447b4afe7ad3d1
2010-11-11 00:03:59 -08:00
Gil Dobjanschi
a71f52bf32
Merge "Close the file input stream if the XML file parsing fails."
2010-11-10 14:43:19 -08:00
James Dong
d1970b8c6e
Merge "Fix uninitialized variable"
2010-11-10 14:18:26 -08:00
James Dong
5d0b783c44
Fix uninitialized variable
...
o This was missed while the rotation patch was hand merged.
Change-Id: I4016f9fb9cd54c5e853da15bbaaa50b1d1dac8c8
2010-11-10 14:07:13 -08:00
Mike Lockwood
f1094227f8
Merge changes I49b383d3,I70809401
...
* changes:
MTP: Don't dump data packets twice in debug output.
Add support for range and enum forms in MTP ObjectPropDescs
2010-11-10 09:57:34 -08:00
Mike Lockwood
83cff86dcd
MTP: Don't dump data packets twice in debug output.
...
Change-Id: I49b383d39aea101a58ae6902952ba91b44e7dc3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-10 12:49:36 -05:00
Mike Lockwood
4a65e281fa
Add support for range and enum forms in MTP ObjectPropDescs
...
Change-Id: I70809401e37a1cfb82f5dbf86947be7d9500ccf1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-10 12:48:39 -05:00
Gil Dobjanschi
1fbeece669
Close the file input stream if the XML file parsing fails.
...
Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
2010-11-10 09:27:13 -08:00
James Dong
c32474d90a
Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder"
2010-11-09 15:48:11 -08:00
James Dong
0244d94455
Fix missing breaks in the profile/level conversion code in M4vH263 encoder
...
Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
2010-11-09 15:15:50 -08:00
Andreas Huber
40e8dc171f
Merge "Some refactoring and added support for another form of vbr headers."
2010-11-09 14:59:13 -08:00
Andreas Huber
1bd9949815
Some refactoring and added support for another form of vbr headers.
...
related-to-bug: 3172324
Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
2010-11-09 14:45:08 -08:00
Jean-Michel Trivi
820b9e0d3b
Add recording source for voice communication
...
Add a recording source used to designate a recording stream for
voice communications such as VoIP.
Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
2010-11-09 14:32:43 -08:00
James Dong
b9d7e01eb8
Rotation support
...
- We only support 0, 90, 180, and 270 degree clockwise rotation
- Some players are known to ignore composition matrix in the MP4 file,
although this is part of the MP4 file standard.
Both QT and YT are supporting the rotation
The original patch (65a73f4e8c79d05c0d9001b660325748d4ecf37b) was not merged.
The only change I made is to reuse the same kKeyRotation in MetaData.h;
and thus do not neeed to use kKeyRotationDegree.
Change-Id: Ib328716d4842201c4adf57e4ddfe1f1ac1ae4d8a
2010-11-09 11:48:29 -08:00
Wu-cheng Li
5680635f39
Use back-facing camera as default in camera/camcorder profile.
...
bug:3173302
Change-Id: Iae9565eb58949a1c9c2f2a1f5251b2df097ec167
2010-11-09 15:36:59 +08:00
James Dong
d1604c7313
am 9cebb86c: am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
...
* commit '9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b':
Update a comment about when setOrientationHint() should be called
2010-11-08 20:43:10 -08:00
James Dong
9cebb86c95
am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
...
* commit '1b2efbca7120cf799d1242d277af354df7b0a9bb':
Update a comment about when setOrientationHint() should be called
2010-11-08 20:14:19 -08:00
James Dong
1b2efbca71
Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
2010-11-08 19:59:16 -08:00
James Dong
d1959717c2
am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
...
* commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84':
Support extracting thumbnail from rotated video tracks
2010-11-08 19:25:41 -08:00
Gil Dobjanschi
8346ad0a8f
Merge "Fix invalidateTransition method"
2010-11-08 19:06:41 -08:00
Gil Dobjanschi
549a65b5a4
Fix invalidateTransition method
...
Change-Id: I12d5b7256d2956007b65c8304053717dd7b9b7ef
2010-11-08 18:44:43 -08:00
James Dong
c4a2ead2aa
am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
...
* commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e':
Support extracting thumbnail from rotated video tracks
2010-11-08 18:19:40 -08:00
James Dong
53ebc72fd8
Support extracting thumbnail from rotated video tracks
...
Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
2010-11-08 16:52:59 -08:00
Andreas Huber
2e1a896724
resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
...
Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
2010-11-08 11:56:08 -08:00
Joe Onorato
51387974f0
Merge "Move the volume, media, call, camera and search key handling from PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors."
2010-11-08 10:59:27 -08:00
James Dong
5aa95dd36c
Update a comment about when setOrientationHint() should be called
...
Change-Id: I389089390a552ee7a86823c050048dcec0a0eb2a
2010-11-08 10:36:53 -08:00
Wu-cheng Li
76f15bcb8b
Do not use CAMERA_ID_DEFAULT because it is removed.
...
bug:3173302
Change-Id: I360e55f2665b2e121c8cf017e17c4cb4dd181e88
2010-11-08 23:40:29 +08:00
James Dong
08caf9e84f
am bb97d7bb: am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread
...
* commit 'bb97d7bbf33393af842de1d8fd8512a24c73b6b3':
Add a new public API to support recording rotated videos
2010-11-06 16:25:39 -07:00
James Dong
d8166a719e
am 1653e261: Merge "Rotation support" into gingerbread
...
* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
Rotation support
2010-11-06 14:22:05 -07:00
James Dong
bb97d7bbf3
am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread
...
* commit '0467b0abfc94f959163d84eadedf6941e41c1882':
Add a new public API to support recording rotated videos
2010-11-06 14:21:53 -07:00
Owen Lin
a726e12fb7
Merge "Add more EXIF tags."
2010-11-06 01:20:19 -07:00
Joe Onorato
86f6786032
Move the volume, media, call, camera and search key handling from
...
PhoneWindow to a new PhoneFallbackEventHandler class that is used
for all windows, not just ones with decors.
Bug: 3155146
Change-Id: Ib070fa3e523e3564b225bca576c08012fef4f416
2010-11-05 18:58:29 -07:00