summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Invalidate transitions when an image media item duration changes."Gil Dobjanschi2010-11-112-60/+111
|\
| * Invalidate transitions when an image media item duration changes.Gil Dobjanschi2010-11-112-60/+111
| | | | | | | | Change-Id: I3cff920ef629df49dcfcb63065afeeb47a649287
* | Increase the prefetcher's low water mark so it restarts fetching data earlier.Andreas Huber2010-11-111-1/+1
| | | | | | | | | | | | 720p high bitrate content pretty much requires this. Change-Id: I2cb29d1fa2e3c511f1b88a106a02c53c68a10f2f
* | Merge "Make sure the prefetcher is actively fetching data if we pause ↵Andreas Huber2010-11-114-4/+26
|\ \ | | | | | | | | | playback due to cache underrun."
| * | Make sure the prefetcher is actively fetching data if we pause playback due ↵Andreas Huber2010-11-114-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to cache underrun. Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3 Conflicts: media/libstagefright/AwesomePlayer.cpp
* | | Add color format query support to QueryCodecs()James Dong2010-11-111-0/+14
| | | | | | | | | | | | Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
* | | Merge "Fix memory leak when 0-memcpy quirk is used"James Dong2010-11-111-1/+18
|\ \ \
| * | | Fix memory leak when 0-memcpy quirk is usedJames Dong2010-11-111-1/+18
| | |/ | |/| | | | | | | | | | | | | | | | o minor change to the original patch by Andreas: call restorePatchedDataPointer() method only if kAvoidMemcopyInputRecordingFrames is turned on Change-Id: Idf3710e6f759d37d28e866613f98d39215722cb9
* | | Merge "MediaFile: Recognize MPG file extension as MPEG video"Mike Lockwood2010-11-111-0/+1
|\ \ \
| * | | MediaFile: Recognize MPG file extension as MPEG videoMike Lockwood2010-11-111-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "Fix testWAVSeekToEnd() testcase"James Dong2010-11-111-4/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix testWAVSeekToEnd() testcaseJames Dong2010-11-111-4/+2
| | |/ | |/| | | | | | | | | | | | | The testcase does not depend on the availability of WMV decoder Change-Id: I983f6d5954242a28fb9818fa03447b4afe7ad3d1
* | | Merge "MTP: Add missing call to closedir() in recursive delete code"Mike Lockwood2010-11-111-0/+1
|\ \ \ | |/ / |/| |
| * | MTP: Add missing call to closedir() in recursive delete codeMike Lockwood2010-11-111-0/+1
| |/ | | | | | | | | | | | | BUG: 3185660 Change-Id: I3744d2cb193829d20a689af2aea50e8516779631 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Close the file input stream if the XML file parsing fails."Gil Dobjanschi2010-11-101-101/+106
|\ \ | |/ |/|
| * Close the file input stream if the XML file parsing fails.Gil Dobjanschi2010-11-101-101/+106
| | | | | | | | Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
* | Merge "Fix uninitialized variable"James Dong2010-11-101-0/+1
|\ \
| * | Fix uninitialized variableJames Dong2010-11-101-0/+1
| |/ | | | | | | | | | | o This was missed while the rotation patch was hand merged. Change-Id: I4016f9fb9cd54c5e853da15bbaaa50b1d1dac8c8
* | Merge changes I49b383d3,I70809401Mike Lockwood2010-11-104-2/+92
|\ \ | |/ |/| | | | | | | * changes: MTP: Don't dump data packets twice in debug output. Add support for range and enum forms in MTP ObjectPropDescs
| * MTP: Don't dump data packets twice in debug output.Mike Lockwood2010-11-102-2/+0
| | | | | | | | | | Change-Id: I49b383d39aea101a58ae6902952ba91b44e7dc3b Signed-off-by: Mike Lockwood <lockwood@android.com>
| * Add support for range and enum forms in MTP ObjectPropDescsMike Lockwood2010-11-102-0/+92
| | | | | | | | | | Change-Id: I70809401e37a1cfb82f5dbf86947be7d9500ccf1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Fix missing breaks in the profile/level conversion code in M4vH263 ↵James Dong2010-11-091-1/+6
|\ \ | | | | | | | | | encoder"
| * | Fix missing breaks in the profile/level conversion code in M4vH263 encoderJames Dong2010-11-091-1/+6
| |/ | | | | | | Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
* | Merge "Some refactoring and added support for another form of vbr headers."Andreas Huber2010-11-098-196/+609
|\ \
| * | Some refactoring and added support for another form of vbr headers.Andreas Huber2010-11-098-196/+609
| |/ | | | | | | | | | | related-to-bug: 3172324 Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
* | Add recording source for voice communicationJean-Michel Trivi2010-11-091-1/+10
| | | | | | | | | | | | | | Add a recording source used to designate a recording stream for voice communications such as VoIP. Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
* | Rotation supportJames Dong2010-11-093-19/+84
|/ | | | | | | | | | | | | | - 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
* Use back-facing camera as default in camera/camcorder profile.Wu-cheng Li2010-11-092-8/+40
| | | | | bug:3173302 Change-Id: Iae9565eb58949a1c9c2f2a1f5251b2df097ec167
* am 9cebb86c: am 1b2efbca: Merge "Update a comment about when ↵James Dong2010-11-081-1/+1
|\ | | | | | | | | | | | | setOrientationHint() should be called" into gingerbread * commit '9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b': Update a comment about when setOrientationHint() should be called
| * am 1b2efbca: Merge "Update a comment about when setOrientationHint() should ↵James Dong2010-11-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | be called" into gingerbread * commit '1b2efbca7120cf799d1242d277af354df7b0a9bb': Update a comment about when setOrientationHint() should be called
| | * Merge "Update a comment about when setOrientationHint() should be called" ↵James Dong2010-11-081-1/+1
| | |\ | | | | | | | | | | | | into gingerbread
| | | * Update a comment about when setOrientationHint() should be calledJames Dong2010-11-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I389089390a552ee7a86823c050048dcec0a0eb2a
* | | | am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated ↵James Dong2010-11-083-1/+66
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | video tracks" into gingerbread * commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84': Support extracting thumbnail from rotated video tracks
| * | | am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" ↵James Dong2010-11-083-1/+66
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into gingerbread * commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e': Support extracting thumbnail from rotated video tracks
| | * | Support extracting thumbnail from rotated video tracksJames Dong2010-11-083-1/+66
| | |/ | | | | | | | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
| * | resolved conflicts for merge of 31dc911a to gingerbread-plus-aospAndreas Huber2010-11-088-90/+230
| |\ \ | | |/ | | | | | | Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
| | * Support post-decode video rotation.Andreas Huber2010-11-058-89/+228
| | | | | | | | | | | | Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
| * | am 1653e261: Merge "Rotation support" into gingerbreadJames Dong2010-11-063-19/+84
| |\ \ | | |/ | | | | | | | | | * commit '1653e261e84922facfe27d3d8acc455ed2b6b6da': Rotation support
| | * Merge "Rotation support" into gingerbreadJames Dong2010-11-053-19/+84
| | |\
| | | * Rotation supportJames Dong2010-11-053-19/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
* | | | Merge "Fix invalidateTransition method"Gil Dobjanschi2010-11-087-48/+56
|\ \ \ \
| * | | | Fix invalidateTransition methodGil Dobjanschi2010-11-087-48/+56
| | | | | | | | | | | | | | | | | | | | Change-Id: I12d5b7256d2956007b65c8304053717dd7b9b7ef
* | | | | Merge "Move the volume, media, call, camera and search key handling from ↵Joe Onorato2010-11-081-0/+68
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors."
| * | | | Move the volume, media, call, camera and search key handling fromJoe Onorato2010-11-051-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors. Bug: 3155146 Change-Id: Ib070fa3e523e3564b225bca576c08012fef4f416
* | | | | Do not use CAMERA_ID_DEFAULT because it is removed.Wu-cheng Li2010-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | bug:3173302 Change-Id: I360e55f2665b2e121c8cf017e17c4cb4dd181e88
* | | | | am bb97d7bb: am 0467b0ab: Merge "Add a new public API to support recording ↵James Dong2010-11-061-0/+25
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | rotated videos" into gingerbread * commit 'bb97d7bbf33393af842de1d8fd8512a24c73b6b3': Add a new public API to support recording rotated videos
| * | | | am 0467b0ab: Merge "Add a new public API to support recording rotated ↵James Dong2010-11-061-0/+25
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | videos" into gingerbread * commit '0467b0abfc94f959163d84eadedf6941e41c1882': Add a new public API to support recording rotated videos
| | * | | Add a new public API to support recording rotated videosJames Dong2010-11-051-0/+25
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | o changed a comment about the rotation orientation from counter-clockwise to clockwise. Change-Id: I16ad73ce1a55cc627d9a516e23d1325753b3037e
| * | | am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into ↵James Dong2010-11-033-39/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b': Revert "Support rotation in media recorder"
| | * | Revert "Support rotation in media recorder"James Dong2010-11-033-39/+0
| | | | | | | | | | | | | | | | This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.