summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* 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-151-25/+234
|\
| * media: use ResourceManagerService with MediaCodecRonghua Wu2015-04-141-25/+234
| | | | | | | | | | 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
* | | media: handle overrides and measure max codec instance.Ronghua Wu2015-04-136-31/+959
| | | | | | | | | | | | | | | 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 "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
* | | | mediaplayer: support async mode for widevine legacy modeLajos Molnar2015-04-101-1/+15
| | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: Id224eb8c31ec148ca9a144758cc56ddbf5465f5c
* | | | mediaplayer: use async mode in NuPlayerMarco Nelissen2015-04-101-3/+3
| | | | | | | | | | | | | | | | | | | | 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 "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 "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
* | | | 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
| * \ \ \ 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
| * | | | | Merge "Don't fail read when "seeking" to current position"Marco Nelissen2015-04-091-6/+11
| |\ \ \ \ \
| | * | | | | Don't fail read when "seeking" to current positionMarco Nelissen2015-04-031-6/+11
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes thumbnails for MPEG2TS files. Bug: 19583374 Change-Id: I66e5ca014e2f32ba2566c6f511b6e8859d5a97dc
| * | | | | Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in ↵Marco Nelissen2015-04-091-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | H264/MPEG_VIDEO"
| | * | | | | ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEORobert Shih2015-04-031-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | H264/MPEG_VIDEO sync words can be either 0x000001 (3 bytes) or 0x00000001 (4 bytes); simply searching for 0x000001 in appendData suffices because: 1. 0x000001 is a suffix of 0x00000001, as such we would continue to identify all sync words that we used to identify originally. 2. the parsing logic downstream of appendData in dequeueAccessUnitMPEGVideo and dequeueAccessUnitH264 can both handle 0x000001. Bug: 19900317 Change-Id: Iac42aad74563d056a443b4396eacbae0f7a4738b
generated by cgit v1.1 at 2024-05-18 10:47:53 +0000