summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* audio policy: add binder calls for audio source controlEric Laurent2015-04-152-0/+75
| | | | | | | Add binder methods to IAudioPolicyService to control activity of external audio sources (e.g FM tuner). Change-Id: I2008308a6a996baeae502b68a790d87281efe2ff
* Merge "fix NuPlayerDecoder discontinuity handling with async mode"Chong Zhang2015-04-151-4/+0
|\
| * fix NuPlayerDecoder discontinuity handling with async modeChong Zhang2015-04-151-4/+0
| | | | | | | | | | | | bug: 20234224 Change-Id: I317b52b089f1e1432255100ef5f36322a231a399
* | Merge "AudioPolicyManager: notification of dynamic policy mix activity"Jean-Michel Trivi2015-04-153-1/+26
|\ \
| * | AudioPolicyManager: notification of dynamic policy mix activityJean-Michel Trivi2015-04-143-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement non-stream type specific ref counting in output descriptors to keep track of mix activity. Notify audio policy client of mix activity changes. Bug 20226914 Change-Id: Iec939cb640c58056f88947b611d23b4bb6d8a11b
* | | skip parsing of 'hdlr' atom when parsing QT metaChong Zhang2015-04-151-1/+6
| |/ |/| | | | | | | bug: 20244718 Change-Id: Ifb8a6d450a2f1ad2833301f492dc0ccfe1cd34d4
* | Merge "media: use ResourceManagerService with MediaCodec"Ronghua Wu2015-04-152-25/+236
|\ \
| * | media: use ResourceManagerService with MediaCodecRonghua Wu2015-04-142-25/+236
| | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I235a97e5195b28645b7834dda0dd77307d93f4a8
* | | Merge "HLS: parse stream resolution and set maxWidth/maxHeight"Chong Zhang2015-04-154-0/+64
|\ \ \
| * | | HLS: parse stream resolution and set maxWidth/maxHeightChong Zhang2015-04-144-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | bug: 20160436 Change-Id: Ic3adb84d3c65cc65f62fc509a99d09602db862a1
* | | | Merge "stagefright: metadata retriever changes for capture fps"Chong Zhang2015-04-143-20/+161
|\ \ \ \
| * | | | stagefright: metadata retriever changes for capture fpsChong Zhang2015-04-133-20/+161
| |/ / / | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I20afded0b7eec45b2f25b51cf59d9f48eada74d8
* | | | Merge "mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream"Jinsuk Kim2015-04-142-0/+34
|\ \ \ \
| * | | | mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts streamTerry Heo2015-04-142-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to find sync frame of mpeg2, mpeg4 and h264 Bug: 19940277 Change-Id: I4d95ae247f590b831bf11ff8c9c6fe45d21dab56
* | | | | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack"Glenn Kasten2015-04-142-2/+14
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | AudioRecord::obtainBuffer() can return nonContig like AudioTrackGlenn Kasten2015-04-132-2/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | And fix error handling in both AudioRecord and AudioTrack. Change-Id: I4853d736cc6d2c05de5b18b0eac62716edfa62ec
* | | | media: handle overrides and measure max codec instance.Ronghua Wu2015-04-138-31/+998
| | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I68d5919284700f37ccc6c6b9f96cd87ccdd40e6a
* | | | Merge "libstagefright: parse global settings from codec xml file."Ronghua Wu2015-04-141-10/+83
|\ \ \ \
| * | | | libstagefright: parse global settings from codec xml file.Ronghua Wu2015-04-131-10/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also parse a new codec limit "max-supported-instances". Bug: 19620911 Change-Id: I6574c168b0c2b1aa649883958d3073edc01a4a03
* | | | | Merge "TimestretchBufferProvider integration with Sonic Library"Ricardo Garcia2015-04-141-1/+2
|\ \ \ \ \
| * | | | | TimestretchBufferProvider integration with Sonic LibraryRicardo Garcia2015-04-131-1/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Sonic as backbone for time stretching algorithm. Adding libsonic to needed makefiles. bug: 19196501 Change-Id: I1ea9221d2f56e4e79fba8746ce0ad350b5079e82
* | | | | Merge "Remove deprecated image defines"Lajos Molnar2015-04-141-7/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove deprecated image definesJohann2015-04-101-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libvpx has always supported the VPX_ prefixed versions of these defines. The unprefixed versions have been removed in the most recent release. https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d72eade9ad162ef8f78a93bd8f85c6de10 Change-Id: Idae747eb9f6e71a41a63c6b326af36dc52f5446d
* | | | | Merge "MediaCodec: add DeathNotifier to BatteryNotifier"Chong Zhang2015-04-131-10/+74
|\ \ \ \ \
| * | | | | MediaCodec: add DeathNotifier to BatteryNotifierChong Zhang2015-04-101-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make the battery notifier more robust bug: 20071299 Change-Id: I0ecfecc787c88ace26dba5e235aa0c345bcace6d
* | | | | | Merge "NuPlayerRenderer: adjust delay of posting drain audio message based ↵Wei Jia2015-04-131-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | on playback rate."
| * | | | | NuPlayerRenderer: adjust delay of posting drain audio message based on ↵Wei Jia2015-04-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback rate. Bug: 19196501 Change-Id: I2a98e877ed946e899af0974a0c2397c4146ce349
* | | | | | mediaplayer: support async mode for widevine legacy modeLajos Molnar2015-04-102-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: Id224eb8c31ec148ca9a144758cc56ddbf5465f5c
* | | | | | mediaplayer: use async mode in NuPlayerMarco Nelissen2015-04-103-118/+156
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: I5e471a6e13be82a375afc2718599f27cd0255bf5
* | | | | libstagefright: handle MediaFormat "operating-rate" key.Ronghua Wu2015-04-101-0/+38
| |/ / / |/| | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I846d3cc10308a13f2ed92bb82ba7e8236d9c67d1
* | | | libstagefright: convert status_t to OMX_ERRORTYPE.Ronghua Wu2015-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I32369b2e812c7f3ef6953b13a1dae046b8dc24f1
* | | | Merge "libstagefright: propagate error from allocateNode."Ronghua Wu2015-04-101-5/+6
|\ \ \ \
| * | | | libstagefright: propagate error from allocateNode.Ronghua Wu2015-04-101-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: Iee288343d7d851a395052e1b3354eb98b026e4fb
* | | | | Merge "Add a method to associate MediaDrm session with MediaCrypto"Jeff Tinker2015-04-103-0/+54
|\ \ \ \ \
| * | | | | Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-103-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, to associate a MediaDrm session with MediaCrypto, the MediaDrm sessionId was passed as initData to the MediaCrypto constructor. This is not ideal for two reasons: it's pretty obscure and you can't change the association without tearing down the MediaCodec/MediaCrypto and starting all over. Use cases like key rotation require being able to update the MediaDrm session post-construction. This CL addresses both of these issues. bug: 19570317 Change-Id: Ieb32d04d61742fc1dee2105dd904690d44c46c7b
* | | | | | Merge "HLS: allow down switch during prepare"Chong Zhang2015-04-103-33/+63
|\ \ \ \ \ \
| * | | | | | HLS: allow down switch during prepareChong Zhang2015-04-093-33/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid having to immediately down switch (and pause) after playback starts. do not count "discard" packet when estimating duration. bug: 19567254 Change-Id: I0cdd37a06ca800dd81a91cca5eb9b46a1eab7b20
* | | | | | | Merge "Add playback rate to AudioTrack"Andy Hung2015-04-102-15/+128
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add playback rate to AudioTrackAndy Hung2015-04-092-15/+128
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I6411e1d3ce652b711a71a6d9df020cb5f60d4714
* | | | | | Merge "Fix integer underflow in ESDS processing"Nick Kralevich2015-04-101-0/+6
|\ \ \ \ \ \
| * | | | | | Fix integer underflow in ESDS processingJoshua J. Drake2015-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several arithmetic operations within parseESDescriptor could underflow, leading to an out-of-bounds read operation. Ensure that subtractions from 'size' do not cause it to wrap around. Bug: 20139950 Change-Id: I0d1b136ce68fd7c6f606ce66714bf644cfb2961c
* | | | | | | Merge "Fix integer overflow during MP4 atom processing"Nick Kralevich2015-04-101-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix integer overflow during MP4 atom processingJoshua J. Drake2015-04-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few sample table related FourCC values are handled by the setSampleToChunkParams function. An integer overflow exists within this function. Validate that mNumSampleToChunkOffets will not cause an integer overflow. Bug: 20139950 Change-Id: I1972cc185fce5e058afa143ad5eabcc269ad324d
* | | | | | | Merge "Detect allocation failures and bail gracefully"Nick Kralevich2015-04-101-5/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Detect allocation failures and bail gracefullyJoshua J. Drake2015-04-091-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the processing of several sample table related MP4 atoms, allocation sizes could be large enough cause a std::bad_alloc exception to be raised. This typically causes a crash (denial of service condition). Use std::nothrow to catch allocation failures and return gracefully. Bug: 20139950 Change-Id: I03d3f01b24e5fe3fa38985914bcfa694ea3dc09e
* | | | | | | Merge "Fix several ineffective integer overflow checks"Nick Kralevich2015-04-101-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix several ineffective integer overflow checksJoshua J. Drake2015-04-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit edd4a76 (which addressed bugs 15328708, 15342615, 15342751) added several integer overflow checks. Unfortunately, those checks fail to take into account integer promotion rules and are thus themselves subject to an integer overflow. Cast the sizeof() operator to a uint64_t to force promotion while multiplying. Bug: 20139950 Change-Id: Ieb29a170edb805c722fc5658935f2390003e5260
* | | | | | | Merge "Fix multiple division-by-zero conditions in MPEG4 parsing"Nick Kralevich2015-04-101-3/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix multiple division-by-zero conditions in MPEG4 parsingJoshua J. Drake2015-04-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several situations arise processing MP4 atoms that lead to undefined behavior when dividing by zero. Typically this results in a crash (denial of service condition). NOTE: In most cases we simply avoid the division, leaving kKeyDuration unset. It may be more desirable to bail out, as we do in the parseSegmentIndex case. Bug: 20139950 Change-Id: I62e1b977f0e5ed0094094a55d300bac76b476c7b
* | | | | | | Merge "Fix null-pointer-dereferences accessing the SampleTable"Nick Kralevich2015-04-101-0/+18
|\ \ \ \ \ \ \ | |/ / / / / /
generated by cgit v1.1 at 2024-05-02 02:24:06 +0000