summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MTP: Fix time values returned via GetObjectPropValue and ↵Mike Lockwood2010-11-152-10/+16
|\ | | | | | | GetObjectPropList"
| * MTP: Fix time values returned via GetObjectPropValue and GetObjectPropListMike Lockwood2010-11-152-10/+16
| | | | | | | | | | Change-Id: If9bb8b4b19ed6c8d57736e5d1af948fcc946af0e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "More HTTP live support, AES encryption etc."Andreas Huber2010-11-159-47/+361
|\ \
| * | More HTTP live support, AES encryption etc.Andreas Huber2010-11-159-47/+361
| | | | | | | | | | | | | | | Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c related-to-bug: 2368598
* | | Merge "Refactor h.264 profile/level support into avc_utils."Andreas Huber2010-11-153-34/+42
|\ \ \
| * | | Refactor h.264 profile/level support into avc_utils.Andreas Huber2010-11-153-34/+42
| |/ / | | | | | | | | | | | | Change-Id: Idb33636dc723aa79ea0122dc3582109ada4b1358 related-to-bug: 2368598
* | | Merge "Provide bandwidth estimation support in NuHTTPDataSource"Andreas Huber2010-11-152-0/+69
|\ \ \
| * | | Provide bandwidth estimation support in NuHTTPDataSourceAndreas Huber2010-11-152-0/+69
| |/ / | | | | | | | | | | | | Change-Id: Ic98d8cf147bbba60ec735e7ca200addb2bd09f29 related-to-bug: 2368598
* | | Merge "Add http live mime types to MediaFile, add support for playlist mime ↵Andreas Huber2010-11-151-4/+9
|\ \ \ | | | | | | | | | | | | types to browser."
| * | | Add http live mime types to MediaFile, add support for playlist mime types ↵Andreas Huber2010-11-151-4/+9
| |/ / | | | | | | | | | | | | | | | | | | to browser. Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f related-to-bug: 2368598
* | | Merge "Remove legacy PV stuff"James Dong2010-11-154-65/+4
|\ \ \ | |_|/ |/| |
| * | Remove legacy PV stuffJames Dong2010-11-154-65/+4
| |/ | | | | | | Change-Id: I60ffea7c65592df4b3a80c590c863f1f79b371fd
* | MTP: Partial implementation of the GetObjectPropList commandMike Lockwood2010-11-1510-221/+665
| | | | | | | | | | | | | | | | | | | | In this initial implementation we only support fetching one property at a time. Support depth = 0 (single object) or depth = 1 (all objects in a directory) Reimplemented GetObjectPropValue on top of GetObjectPropList, since the former is a special case of the latter. Change-Id: Ia76ee61741d6ee3902b5c5d9fc094cf86dfaf650 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | Merge "MediaScanner: Add support for importing file based playlists copied ↵Mike Lockwood2010-11-151-61/+83
|\ \ | |/ |/| | | over MTP"
| * MediaScanner: Add support for importing file based playlists copied over MTPMike Lockwood2010-11-121-61/+83
| | | | | | | | | | Change-Id: I53a9f204297ff29d4df994d2174bd6d6288f2c97 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Disable flaky streaming server check"James Dong2010-11-151-1/+1
|\ \
| * | Disable flaky streaming server checkJames Dong2010-11-131-1/+1
| | | | | | | | | | | | | | | | | | o Although the streaming server is available, the check fails most of the time. Change-Id: I1084e715605541c4fc3d40e4055db90ddb118b6f
* | | Fix a typo in LOG_TAG for MediaPlayer unit testsJames Dong2010-11-141-1/+1
|/ / | | | | | | Change-Id: I351f32fe4b4da82c32acf5c9e5ebdb81bb003525
* | Merge "Transition invalidation bug fix."Gil Dobjanschi2010-11-121-47/+96
|\ \
| * | Transition invalidation bug fix.Gil Dobjanschi2010-11-121-47/+96
| |/ | | | | | | Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
* | Merge "Separate the key for audio sampling rate and video frame rate in ↵James Dong2010-11-125-11/+11
|\ \ | | | | | | | | | MetaData.h"
| * | Separate the key for audio sampling rate and video frame rate in MetaData.hJames Dong2010-11-115-11/+11
| |/ | | | | | | Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
* | Add support for audio recording source in generic audio policy mgr.Jean-Michel Trivi2010-11-121-0/+1
|/ | | | | | | | | 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
* 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