summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Play timed text even after 35.79 minutesPatrik2 Carlsson2015-11-071-1/+1
| | | | | | int overflow when converting current position in ms to Us Change-Id: I12882e52ed1ac92644d601efae5c10ec25ae9e63
* Remove possible div by zero in WavExtractorRoger I Nilsson2015-11-071-2/+4
| | | | | | Do not accept 0 channels as a valid wav format. Change-Id: I8d03d68f58d023b039503732736cc3a82ea560eb
* libstagefright: add NULL check in MediaCodecSource's pullerKim Zhang2015-11-071-1/+1
| | | | | | | | | When CameraSource/AudioSource is stopped, puller will read a NULL buffer with success, so we should add NULL check before release it. Change-Id: I8924167fc79c7880e80115aafbb9cc7c3e9e885c CRs-Fixed: 813924 (cherry picked from commit 3dfbe3ae49c44301a8d484c2c5aaf0c8e1b53203)
* libstagefright: Make it possible to skip OMX buffer reallocationMichael Gernoth2015-11-073-1/+22
| | | | | | | | | | | | | Some devices don't like the call to setParameter() at this point, so skip this call if enough buffers are already allocated. This check was present in KitKat but got removed when code to allocate extra- buffers was introduced. This is activated only for omap4 for now. Squashed 2nd commit: which does same for OMXCodec.cpp Change-Id: I9c1267c2a2a755bc16448a6049cb2e4aff0b65bb
* libstagefright: add missing TI color format caseZiyan2015-11-071-0/+2
| | | | Change-Id: Iaca45e6b15d3315a39b51bbf7f0cf3a1e912fee9
* Fix benign unsigned overflow in AuidoTrackSharedChad Brubaker2015-11-051-2/+2
| | | | | | | fsanitize=integer adds unsigned checks to int32_t - uint32_t, force both operands to int32_t to avoid such checks being added. Change-Id: I76fce38f9636f5322ad95fdb81abb690503f4d08
* Refactor setPlaybackRate to avoid benign unsigned integer overflow.Dan Austin2015-11-051-2/+2
| | | | | | | | There is a check that results in a benign unsigned integer overflow. This has been refactored to avoid the unsigned integer overflow. Bug: 25327431 Change-Id: Ib112a7cd585c680f13e4bee3d7e9f45da7d66f1d
* libstagefright : fix the bug of wrong value setting for slice-heightxrwu2015-11-051-1/+1
| | | | | Change-Id: I2ad0fa6039fb3b31e7dbfdcf15be4703664da04d Signed-off-by: xrwu <xellos.1983@gmail.com>
* Don't send OnCompletion events when loopingMarco Nelissen2015-11-051-1/+2
| | | | | | | AwesomePlayer never did, and neither should NuPlayer. Bug: 18656047 Change-Id: Ia9abe42cfe6ea643633cec859e9da770092569bb
* nuplayer: don't resume if player is resetingRonghua Wu2015-11-052-1/+7
| | | | | Bug: 24712426 Change-Id: I58cca0bde708a5c3b073ed77e18b62fe81d6c017
* Fixed comparison so that both operands are treated as 64 bit.Dan Austin2015-11-051-1/+1
| | | | | | | Fixed comparison in setSampleToChunkParams so that both operands are treated as 64-bit to address build breakage. Change-Id: I4b2bc52e9fc61b7e00898928a09e134e88b179f9
* Fixed benign overflows triggered by tests CVE-2015-1538-1 andDan Austin2015-11-051-4/+9
| | | | | | | CVE-2015-1538-2 in CTS. Bug: 25016754 Change-Id: I0ceb2c799899015be6b37d5e94fe306d0037a8d2
* Fix benign overflow in SampleIteratorChad Brubaker2015-11-051-0/+7
| | | | | Bug:24807954 Change-Id: I83fe1990408c5f1da7cf46ff2a2cafb96b3e8cdd
* Fix benign overflow in OMXNodeInstanceMarco Nelissen2015-11-051-1/+2
| | | | Change-Id: I7470bddb7ade97143ba70c026e3b7d61dd8d97b0
* Fix benign unsigned overflow in OggExtractorChad Brubaker2015-11-051-2/+7
| | | | | | | | | | | When computing mCurrentPageSamples it was possible to have a harmless unsigned integer overflow during the conf pages leading to false positives with fsanitize integer. To prevent the false positives clamp the result to 0. Bug: 23488745 Bug: 23110888 Change-Id: I0769cb4a915d45b00ea43f2abbefe9ee46165cc7
* Fix benign overflow in getTimeUsOfGranuleChad Brubaker2015-11-051-0/+6
| | | | | Bug: 24748446 Change-Id: I1f8e3927e9a8f646a0d804161924ae0dcc5ab75d
* Fix offset adjustment when skipping off-spec meta chunkMarco Nelissen2015-11-051-3/+3
| | | | | Bug: 25172843 Change-Id: Ibbfe4369176f2a367eab5a39fd742f425b017288
* Add include guard into SampleIterator.hMasaichi Toki2015-11-051-0/+5
| | | | | | Include guard is added to have SampleIterator.h safer. Change-Id: Ib773a529cb7ab9d55524951f8bd8ed37f58c1cad
* Fix benign unsigned integer overflowsVishwath Mohan2015-11-051-2/+4
| | | | | | Bug: 23110888 Change-Id: I1894a61e94a274795cab7fb23a81f3a611717c1d (cherry picked from 25f191c5cb2ec532e534be646c32806f9f85e196)
* Benign integer overflow in PlaylistFetcherDan Austin2015-11-051-1/+2
| | | | | | | | | There is a benign integer overflow in the loop that finds the smallest first PTS from all streams in the current parser. The loop has been refactored to eliminate the integer overflow. Bug: 25008541 Change-Id: Ie2c0f1d360023cad960e071d810dddb1b5420470
* Fix benign unsigned integer overflowVishwath Mohan2015-11-051-2/+2
| | | | | | | | Fixes a benign overflow error in ANetworkSession.cpp Bug: 23110888 Change-Id: Ic64f5100ab1e3f2ffe247ca4f7b40d38c1ff0c2a (cherry picked from cfe302317c873001b0b35352d9f4f52c39f6f4b7)
* Fix benign unsigned integer overflowChad Brubaker2015-11-052-2/+4
| | | | | | Bug:23110888 Change-Id: Ibd6f1c7a9204cf584536c1ee63f6a8e5c6e4aa59 (cherry picked from commit 69c1e038717d3462ea5991425ba009f0aed148d2)
* Fix benign overflows in ACodecMarco Nelissen2015-11-051-2/+4
| | | | Change-Id: Ia699f8a9f5367a9b38aaa6bbbdb0097c3e2ab551
* stagefright: Reduce logspamSteve Kondik2015-11-052-1/+5
| | | | Change-Id: I316d82226ea5b8486e4aefae0d69a361ab115006
* Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-0535-350/+611
|\ | | | | | | | | | | Android 6.0.0 release 26 Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda
| * Merge "AudioTrack: Prevent stop() from reissuing last marker event" into ↵Glenn Kasten2015-10-071-3/+12
| |\ | | | | | | | | | mnc-dr-dev
| | * AudioTrack: Prevent stop() from reissuing last marker eventAndy Hung2015-10-061-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Avoid a duplicate marker event race condition (1 in 30 or less) by clearing marker reached in start() not stop(). Bug: 24497521 Change-Id: I9520d063c7d173d2e642174bf60a2bfe75edf085
| * | am 39d91e7b: Merge "ID3: check possible integer overflow for ↵Wei Jia2015-10-061-2/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | extendedHeaderSize and paddingSize." into mnc-dev * commit '39d91e7bc5c62cf7349cf34ba91ae45f9eb12283': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
| | * \ Merge "ID3: check possible integer overflow for extendedHeaderSize and ↵Wei Jia2015-10-061-2/+19
| | |\ \ | | | | | | | | | | | | | | | paddingSize." into mnc-dev
| | | * | ID3: check possible integer overflow for extendedHeaderSize and paddingSize.Wei Jia2015-10-051-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24623447 Change-Id: Ifbc74454d6e28ad7136efe35ab638a07e46398b1
| * | | | am 6f14568b: am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am ↵Marco Nelissen2015-10-061-2/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev * commit '6f14568be83995a0ee0104f521f93e1e4d9902f3': Check NAL size before use
| | * | | am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am ↵Marco Nelissen2015-10-061-2/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev * commit 'f1790258494751adc629126666e7dd81bbc8afbd': Check NAL size before use
| | | * \ \ am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am ↵Marco Nelissen2015-10-061-2/+9
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74d1927e: Merge "Check NAL size before use" into klp-dev * commit '5e92fdede2391b77cff5fe914d748e1023d0ef90': Check NAL size before use
| | | | * \ \ am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size ↵Marco Nelissen2015-10-061-2/+9
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before use" into klp-dev * commit 'f2cf2bd7448734c6881e3bea2b758f2bf9feeed9': Check NAL size before use
| | | | | * \ \ am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" ↵Marco Nelissen2015-10-061-2/+9
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '07395f4cd72cf29d1de2864cde42876db4e54411': Check NAL size before use
| | | | | | * \ \ am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '00f5fa82d884c0ca41ee08e7a67ab54238109083': Check NAL size before use
| | | | | | | * \ \ am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74d1927e4122a1748f89ca2ef79406fc06ee94b2': Check NAL size before use
| | | | | | | | * \ \ Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | | | |\ \ \
| | | | | | | | | * | | Check NAL size before useMarco Nelissen2015-10-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24441553 Bug: 24445122 Change-Id: Ib7f025769adbafd5a2cb64fae5562a0a565945c2
| | | * | | | | | | | | am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am ↵Wei Jia2015-10-061-0/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit '3674abc050997e664c3906b8507d9d4b63d52e9d': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | * | | | | | | | am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ↵Wei Jia2015-10-061-0/+6
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit '62d89908f6c7e3da9dac36aa439ceb1c2522b86d': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | | * | | | | | | am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer ↵Wei Jia2015-10-061-0/+6
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size is not less than 8 for LastCommentData." into klp-dev * commit 'df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | | | * | | | | | am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not ↵Wei Jia2015-10-061-0/+6
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less than 8 for LastCommentData." into klp-dev * commit '60b25aa0c173854593743dd85588c7449baf87c0': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | | | | * | | | | am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 ↵Wei Jia2015-10-061-0/+6
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for LastCommentData." into klp-dev * commit '9ab9c85e39f089f355faa9cd9db6d113dc482e61': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | | | | | * | | | Merge "MPEG4Extractor: ensure buffer size is not less than 8 for ↵Wei Jia2015-10-061-0/+6
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LastCommentData." into klp-dev
| | | | | | | | | * | | | MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.Wei Jia2015-10-061-0/+6
| | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24346430 Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4 (cherry picked from commit 5cae16bdce77b0a3ba590b55637f7d55a2f35402)
| * | | | | | | | | | | am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am ↵Marco Nelissen2015-10-061-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame * commit '711e9dfc85dfa41c8c840103bd510e98d9b663da': Don't crash when there's no conceal frame
| | * | | | | | | | | | am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am ↵Marco Nelissen2015-10-061-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame * commit '8b3aa04a625dfd3adf68118e64da1eafec9db594': Don't crash when there's no conceal frame
| | | * | | | | | | | | am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am ↵Marco Nelissen2015-10-061-0/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 257b3bc5: Don\'t crash when there\'s no conceal frame * commit 'a0c94bc6582dde27ed31fbb771d7eb758fb9adbe': Don't crash when there's no conceal frame
| | | | * | | | | | | | am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when ↵Marco Nelissen2015-10-061-0/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there\'s no conceal frame * commit '7ce825833ad65cebfded3f35457925ae9e00124a': Don't crash when there's no conceal frame
generated by cgit v1.1 at 2024-05-19 16:59:29 +0000