summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "For static obtainBuffer(), do not set mUnreleased if acknowledging ↵Glenn Kasten2015-10-141-2/+4
|\ | | | | | | flush." into mnc-dr-dev
| * For static obtainBuffer(), do not set mUnreleased if acknowledging flush.Andy Hung2015-10-131-2/+4
| | | | | | | | | | | | | | static audio tracks use obtainBuffer() to update position in start(). Bug: 22938515 Change-Id: I8ae32f6cce4d122386d2cf8982e158049b04ba9a
* | Merge "NuPlayerRenderer: do not send rendering started message when paused" ↵Glenn Kasten2015-10-142-1/+11
|\ \ | | | | | | | | | into mnc-dr-dev
| * | NuPlayerRenderer: do not send rendering started message when pausedAndy Hung2015-10-132-1/+11
| | | | | | | | | | | | | | | | | | | | | Delay until resume. Bug: 23669269 Change-Id: I0a805812d80b1aad561425442bca0fc05a05752f
* | | Merge "AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT." into ↵Glenn Kasten2015-10-141-1/+5
|\ \ \ | |/ / |/| | | | | mnc-dr-dev
| * | AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT.Andy Hung2015-10-131-1/+5
| |/ | | | | | | | | | | | | Send only EVENT_NEW_IAUDIOTRACK to initiate teardown. Bug: 23750452 Change-Id: Ib5dcd578b5b6a6a1d91a03e58ef8da0acd994243
* | Merge "Don't send OnCompletion events when looping" into mnc-dr-devMarco Nelissen2015-10-131-1/+2
|\ \
| * | Don't send OnCompletion events when loopingMarco Nelissen2015-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | AwesomePlayer never did, and neither should NuPlayer. Bug: 18656047 Change-Id: Ia9abe42cfe6ea643633cec859e9da770092569bb
* | | NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.Wei Jia2015-10-131-0/+6
| | | | | | | | | | | | | | | | | | Bug: 24749881 Change-Id: I0d3a757262446ac702dfebd464d5e59f1a98eba8 (cherry picked from commit 3261f0db54e31e652af9bd3b76a8e85174f5ee87)
* | | Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-devWei Jia2015-10-131-1/+1
|\ \ \
| * | | NuPlayerDriver: acquire mLock when needed.Wei Jia2015-10-131-1/+1
| | |/ | |/| | | | | | | | | | | | | Bug: 24338126 Change-Id: Ic55d1a551c18255423423079b6c2bf045dea6e44 (cherry picked from commit f3631d2921ee0738f87427848e38873370ef9ec0)
* | | Merge "NuPlayerRenderer: always update MediaClock with max media duration." ↵Wei Jia2015-10-131-9/+7
|\ \ \ | |/ / |/| | | | | into mnc-dr-dev
| * | NuPlayerRenderer: always update MediaClock with max media duration.Wei Jia2015-10-131-9/+7
| |/ | | | | | | | | | | Bug: 24345295 Change-Id: I868c9c44ea22de98a083432262e485d0f134203f (cherry picked from commit d005c5ddb4842369979df7b76f1d0f5f1380fcd9)
* | Merge "libstagefright: don't reclaim codec when there's buffer owned by ↵Ronghua Wu2015-10-131-1/+41
|\ \ | |/ |/| | | client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev
| * libstagefright: don't reclaim codec when there's buffer ownedRonghua Wu2015-10-051-1/+41
| | | | | | | | | | | | | | | | | | by client. Notify the client and try to reclaim again in 0.5s. Bug: 23703241 Bug: 23949540 Change-Id: I1afe50c71635645668bfb73ffa0d801765b5ae3c
* | 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
| | | | * | | | | | | | am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal ↵Marco Nelissen2015-10-061-0/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame * commit '13b6b51e6d9c399f0bfa55be4eecaf47b63845f2': Don't crash when there's no conceal frame
| | | | | * | | | | | | am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4': Don't crash when there's no conceal frame
| | | | | | * | | | | | am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '257b3bc581bbc65318a4cc2d3c22a07a4429dc1d': Don't crash when there's no conceal frame
| | | | | | | * | | | | Don't crash when there's no conceal frameMarco Nelissen2015-10-051-0/+5
| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24630158 Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
| | | | | | * | | | | am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+22
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3737a3fa121796131ea5b782230e65dad9ccf90f': DO NOT MERGE stagefright: fix AMessage::FromParcel
| | | | | | | * | | | DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for incoming mNumItems. Also add check readCString return value. Fix style & add log. Bug: 24123723 Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
| | | | | | * | | | | am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-devJeff Tinker2015-09-171-0/+2
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6272fa1baf361a6a89607243638cc592047947b3': DO NOT MERGE Fix vulnerability in mediaserver
| | | | | | | * | | | Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-devJeff Tinker2015-09-171-0/+2
| | | | | | | |\ \ \ \
| | | | | | | | * | | | DO NOT MERGE Fix vulnerability in mediaserverJeff Tinker2015-09-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICrypto.cpp: ASLR bypass using DECRYPT IPC bug: 24074485 Change-Id: I40dd0e92083c7093030393b16dbab59323306a4e
| | | | | | * | | | | | am f43125ed: Merge "Fix for security vulnerability in media server DO NOT ↵Jeff Tinker2015-09-171-1/+23
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-dev * commit 'f43125ed08a408b02613b99f058564d97ce690cc': Fix for security vulnerability in media server DO NOT MERGE
generated by cgit v1.1 at 2024-05-28 23:33:31 +0000