summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-018-141/+336
| | | | | | Bug: 15986092 Change-Id: I9dc6828332e4091fd93bf2d82839e8e3862a2fc2
* Merge "mediaplayer: remove unused parameter needNotify in ↵Wei Jia2015-05-162-13/+10
|\ | | | | | | NuPlayer::performSeek." into mnc-dev
| * mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek.Wei Jia2015-05-152-13/+10
| | | | | | | | Change-Id: I5ee4c3ba968a2ac52266cda0425d1a709e5c0fb2
* | Merge "MPEG4Writer: fix unintiialized member variables" into mnc-devChong Zhang2015-05-151-0/+7
|\ \
| * | MPEG4Writer: fix unintiialized member variablesChong Zhang2015-05-151-0/+7
| |/ | | | | | | | | bug: 20858729 Change-Id: Iccd62dca311fa66cb52ef53ed703719ddcf92cc8
* | Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-devRobert Shih2015-05-153-3/+3
|\ \
| * | Change mime for HLS timed ID3 stream to application/x-id3v4Robert Shih2015-05-143-3/+3
| | | | | | | | | | | | | | | Bug: 21151892 Change-Id: I6a243b0edbbb445df0caf65f395f81926fd515f0
* | | Merge "stagefright: check IMemory::pointer() before using the allocation" ↵Chong Zhang2015-05-151-2/+2
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | stagefright: check IMemory::pointer() before using the allocationChong Zhang2015-05-151-2/+2
| | |/ | |/| | | | | | | | | | bug: 19779574 Change-Id: I4ffe8c3fadc07da211f421e75ee83010b01d9cbb
* | | Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-devRobert Shih2015-05-151-13/+11
|\ \ \ | |/ / |/| |
| * | HTTPLiveSource: fix non timed id3 track selectionRobert Shih2015-05-151-13/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non timed id3 track selection generates INVALID_OPERATION when performed on the last track. The buggy logic reads: if (not last track) { // non-timed-id3 related work } else if (has timed id3) { // timed id3 related work } // last track but non timed id3 not handled It should read: if (has no timed id3 || not last track) { // non-timed-id3 track related work } else { // timed id3 related work } Bug: 21195284 Change-Id: I2ddb5d8e2a1ecba4cc071c7ee14c6697fe8e220d
* | Merge "stagefright: prevent more crashes in ACodec" into mnc-devLajos Molnar2015-05-141-164/+299
|\ \
| * | stagefright: prevent more crashes in ACodecLajos Molnar2015-05-131-164/+299
| | | | | | | | | | | | | | | | | | | | | Signal errors if OMX or native window reports an error Bug: 20439174 Change-Id: Iebeb16f5a29c6819d39568a184b921799a234686
* | | Merge "stagefright: Prevent crashes in ACodec - part 1" into mnc-devJinsuk Kim2015-05-131-136/+219
|\ \ \ | |/ /
| * | stagefright: Prevent crashes in ACodec - part 1Jinsuk Kim2015-05-131-136/+219
| | | | | | | | | | | | | | | | | | | | | Replaced CHECK_ macros with return statements to avoid crashing. Bug: 20439174 Change-Id: I124297674d5654b62382457e4fcc937d79b163ff
* | | Merge "stagefright: rename usePersistentInputSurface to setInputSurface" ↵Chong Zhang2015-05-1316-52/+49
|\ \ \ | |/ / |/| | | | | into mnc-dev
| * | stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-1316-52/+49
| | | | | | | | | | | | | | | | | | | | | | | | and clear persistent surface pointer when MediaRecorder is reset bug: 21045118 bug: 21045402 Change-Id: Ifd0d6deeb969f2252123929541b30b518cecbf9a
* | | Merge "libmediaplayerservice: unlock before trying to reclaim drm session." ↵Ronghua Wu2015-05-131-0/+11
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | libmediaplayerservice: unlock before trying to reclaim drm session.Ronghua Wu2015-05-131-0/+11
| | | | | | | | | | | | | | | | | | | | Bug: 21086224 Change-Id: Icebd8eab70570e818ff7f5fc3a32e1801c3b92d2
* | | | am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am ↵Lajos Molnar2015-05-132-6/+87
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev * commit '0eb7c79398ef04e457c76f117feef6d7bcbbc684': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| * \ \ \ am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add ↵Lajos Molnar2015-05-122-6/+87
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev * commit 'b5fbb81157eaab594bb37275176a0a178098dc46': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| | * \ \ \ am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect ↵Lajos Molnar2015-05-122-6/+87
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | malformed MPEG4 nal sizes" into lmp-dev * commit 'c531d9956513b9b82dad84aeb507b866e6b3951a': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| | | * \ \ \ am 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed ↵Lajos Molnar2015-05-122-6/+87
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4 nal sizes" into lmp-dev * commit '438217a0a5b3d2bfc6e7cd10c395c7b642013758': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| | | | * \ \ \ Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal ↵Lajos Molnar2015-05-122-6/+87
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | sizes" into lmp-dev
| | | | | * | | | Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizesLajos Molnar2015-04-242-6/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19641538 Change-Id: I5aae3f100846c125decc61eec7cd6563e3f33777
* | | | | | | | | Merge "MediaSync: support changing surface on the fly." into mnc-devWei Jia2015-05-121-13/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MediaSync: support changing surface on the fly.Wei Jia2015-05-111-13/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I5809df2d3bb0dd6b4a982f11d62c4b7a452ed6fb
* | | | | | | | | | Merge "Fix new[] vs delete mismatch." into mnc-devEvgenii Stepanov2015-05-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix new[] vs delete mismatch.Evgenii Stepanov2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detected with AddressSanitizer. Bug: 18202869 Change-Id: I7fa9ee722766968e33faa4d9312385ca303ca274 (cherry picked from commit a37f84ecce59a0d11a687b55527ccb18d4db7f52)
* | | | | | | | | | | mediaplayer: get/set PlaybackRate only when AudioSink has been opened.Wei Jia2015-05-121-3/+3
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I676567fc029b9f82d039990e629374bd48168cec
* | | | | | | | | | Merge "HLS: invoke signalEOS on ATSParser to flush out final samples" into ↵Robert Shih2015-05-113-0/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | HLS: invoke signalEOS on ATSParser to flush out final samplesRobert Shih2015-05-113-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clear EOS status when we reset ATSParser. Bug: 20959760 Change-Id: I730234acf3cdbee08affe0f28b7e8759e11059cb
* | | | | | | | | | stagefright: fix legacy-adaptive experimentLajos Molnar2015-05-081-34/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we are checking for unregistered buffers, we need to preregister the buffers on allocation. Bug: 20894716 Change-Id: Ie89663232c4c0d5bc2dfbd58c3347581c25fb041
* | | | | | | | | | Merge "libstagefright: report special error when codec is released by ↵Ronghua Wu2015-05-081-12/+44
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource manager." into mnc-dev
| * | | | | | | | | | libstagefright: report special error when codec is released by resource manager.Ronghua Wu2015-05-081-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I3403da361adbf2ea6979fcadb0d5ad0889d3513e
* | | | | | | | | | | Merge changes from topic 'codec-surface' into mnc-devLajos Molnar2015-05-083-18/+137
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright: enable experiments stagefright: allow connecting to surfaces that attach buffers
| * | | | | | | | | | stagefright: enable experimentsLajos Molnar2015-05-073-4/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20894716 Change-Id: I8c05b99dca8b3099a3a1b2b465f0f58bef786572
| * | | | | | | | | | stagefright: allow connecting to surfaces that attach buffersLajos Molnar2015-05-071-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that consumers can attach buffers to BufferQueues, we cannot assert if an unknown buffer is dequeud, or if a buffer is dequeued from a BufferQueue multiple times. Also, when attaching to such surfaces, allocation must be enabled as attach will lock for a free buffer slot. Bug: 20885565 Change-Id: Ied466c5a848facf3149ad8bf0d18a0095da21e40
* | | | | | | | | | | Fix comparison sign warnings.Dan Albert2015-05-081-3/+3
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f2e2b03b968a569b122004b4803c5d17fccfb12
* | | | | | | | | | libstagefright: config resource manager with secure codec co-existing policy.Ronghua Wu2015-05-085-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I0d729782c1622f23e9c37b7a9231e58e3f807470
* | | | | | | | | | Prevent integer overflow when processing covr MPEG4 atomsJoshua J. Drake2015-05-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the 'chunk_data_size' value is SIZE_MAX, an integer overflow will occur and cause an undersized buffer to be allocated. The following processing then overfills the resulting memory and creates a potentially exploitable condition. Ensure that integer overflow does not occur. Bug: 20923261 Change-Id: I75cce323aec04a612e5a230ecd7c2077ce06035f
* | | | | | | | | | Merge "Fix integer overflow when handling MPEG4 tx3g atom" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix integer overflow when handling MPEG4 tx3g atomJoshua J. Drake2015-05-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the sum of the 'size' and 'chunk_size' variables is larger than 2^32, an integer overflow occurs. Using the result value to allocate memory leads to an undersized buffer allocation and later a potentially exploitable heap corruption condition. Ensure that integer overflow does not occur. Bug: 20923261 Change-Id: Id050a36b33196864bdd98b5ea24241f95a0b5d1f
* | | | | | | | | | | Merge "Prevent integer underflow if size is below 6" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prevent integer underflow if size is below 6Joshua J. Drake2015-05-071-0/+4
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When processing 3GPP metadata, a subtraction operation may underflow and lead to a rather large linear byteswap operation in the subsequent framedata decoding code. Bound the 'size' value to prevent this from occurring. Bug: 20923261 Change-Id: I35dfbc8878c6b65cfe8b8adb7351a77ad4d604e5
* | | | | | | | | | | Merge "Fix integer underflow in covr MPEG4 processing" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix integer underflow in covr MPEG4 processingJoshua J. Drake2015-05-071-0/+4
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the 'chunk_data_size' variable is less than 'kSkipBytesOfDataBox', an integer underflow can occur. This causes an extraordinarily large value to be passed to MetaData::setData, leading to a buffer overflow. Bug: 20923261 Change-Id: Icd28f63594ad941eabb3a12c750a4a2d5d2bf94b
* | | | | | | | | | | Merge "Prevent reading past the end of the buffer in 3GPP" into mnc-devNick Kralevich2015-05-081-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prevent reading past the end of the buffer in 3GPPJoshua J. Drake2015-05-071-2/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Metadata processed within the parse3GPPMetaData function may not be NUL terminated and thus calling setCString may read out of bounds. Ensure proper NUL termination, but take care not to interfere with other special cases (ie, albm). Bug: 20923261 Change-Id: Ie93b3038b534b4c4460571a68f4d734cff7ad324
* | | | | | | | | | | Merge "libstagefright: export profiling results directly to xml." into mnc-devRonghua Wu2015-05-084-369/+122
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
generated by cgit v1.1 at 2024-06-09 18:15:51 +0000