summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* media: use ResourceManagerService with MediaCodecRonghua Wu2015-04-142-25/+236
| | | | | Bug: 19620911 Change-Id: I235a97e5195b28645b7834dda0dd77307d93f4a8
* 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
|\ \ \ \ \ | |/ / / /
| * | | | Fix null-pointer-dereferences accessing the SampleTableJoshua J. Drake2015-04-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While processing various sample table related FourCC values, methods are called on a NULL mLastTrack or sampleTable object. This leads to undefined behavior which typically results in a crash (denial of service condition). Bug: 20139950 Change-Id: Ie2dd8222e702d8bf95faf7d2bd44e6303cd21f68
* | | | | Merge "MPEG4Extractor: still more NULL dereference fixes"Nick Kralevich2015-04-101-0/+56
|\ \ \ \ \ | |/ / / /
| * | | | MPEG4Extractor: still more NULL dereference fixesJoshua J. Drake2015-04-091-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When processing various FourCC values within MP4 media, mLastTrack is accessed without first ensuring that a track has been encoutered. Check for NULL and bail out instead of crashing. Bug: 20139950 Change-Id: Ie16687024d17348f576a0e13bd60bd4d6898de91
* | | | | Merge "MediaClock: allow user to query playback rate."Wei Jia2015-04-091-0/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | MediaClock: allow user to query playback rate.Wei Jia2015-04-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I306579e481cfcf923422d50d3d5cfae045ef2227
* | | | | Add expiration update and keys change eventsJeff Tinker2015-04-092-13/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In support of unprefixed EME bug: 19771612 bug: 19771431 Change-Id: Ib19d4c8db25f5b09f9a30ebd4992b668cad9bfc4
* | | | | Merge "stagefright: LiveSession: delay consuming reply ID for seek"Lajos Molnar2015-04-092-17/+10
|\ \ \ \ \
| * | | | | stagefright: LiveSession: delay consuming reply ID for seekLajos Molnar2015-04-082-17/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only consume reply ID when actually handling the seek. Bug: 20123914 Change-Id: I2112ee1b89f8193b487ea2b0b3b7050ba3413864
* | | | | am 3f14f569: am de2faabb: am d661654a: am 0958e926: Merge "Log cause of ↵Marco Nelissen2015-04-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure to dlopen" * commit '3f14f5692ab396bfd0193a280311a600abeabeaa': Log cause of failure to dlopen
| * \ \ \ \ am d661654a: am 0958e926: Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd661654a637438fb7a03270e289de3f1fd5e4956': Log cause of failure to dlopen
| | * \ \ \ \ am 0958e926: Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0958e926fef85d7e1e0eb08f330ff46218b72822': Log cause of failure to dlopen
| | | * \ \ \ \ Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Log cause of failure to dlopenMarco Nelissen2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19782799 Change-Id: Idba3d802debb12bb4986c525bb9bb5e3cec09f7d
* | | | | | | | | am fdbafc07: am da589e3d: am fc33bb3f: am e686cc09: Merge "Don\'t fail read ↵Marco Nelissen2015-04-091-6/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when "seeking" to current position" * commit 'fdbafc0728380645ee2194e2ccfe72b12c65fccf': Don't fail read when "seeking" to current position
| * | | | | | | | am fc33bb3f: am e686cc09: Merge "Don\'t fail read when "seeking" to current ↵Marco Nelissen2015-04-091-6/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" * commit 'fc33bb3f7474c45eca4de112ccf048150a9112f6': Don't fail read when "seeking" to current position
generated by cgit v1.1 at 2024-06-10 19:59:51 +0000