summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "For static obtainBuffer(), do not set mUnreleased if acknowledging flu...Glenn Kasten2015-10-141-2/+4
|\
| * For static obtainBuffer(), do not set mUnreleased if acknowledging flush.Andy Hung2015-10-131-2/+4
* | Merge "NuPlayerRenderer: do not send rendering started message when paused" i...Glenn Kasten2015-10-142-1/+11
|\ \
| * | NuPlayerRenderer: do not send rendering started message when pausedAndy Hung2015-10-132-1/+11
* | | Merge "AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT." into mnc-d...Glenn Kasten2015-10-141-1/+5
|\ \ \ | |/ / |/| |
| * | AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT.Andy Hung2015-10-131-1/+5
| |/
* | 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
* | | NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.Wei Jia2015-10-131-0/+6
* | | 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
| | |/ | |/|
* | | Merge "NuPlayerRenderer: always update MediaClock with max media duration." i...Wei Jia2015-10-131-9/+7
|\ \ \ | |/ / |/| |
| * | NuPlayerRenderer: always update MediaClock with max media duration.Wei Jia2015-10-131-9/+7
| |/
* | Merge "libstagefright: don't reclaim codec when there's buffer owned by clien...Ronghua Wu2015-10-131-1/+41
|\ \ | |/ |/|
| * libstagefright: don't reclaim codec when there's buffer ownedRonghua Wu2015-10-051-1/+41
* | Merge "AudioTrack: Prevent stop() from reissuing last marker event" into mnc-...Glenn Kasten2015-10-071-3/+12
|\ \
| * | AudioTrack: Prevent stop() from reissuing last marker eventAndy Hung2015-10-061-3/+12
* | | am 39d91e7b: Merge "ID3: check possible integer overflow for extendedHeaderSi...Wei Jia2015-10-061-2/+19
|\ \ \
| * \ \ Merge "ID3: check possible integer overflow for extendedHeaderSize and paddin...Wei Jia2015-10-061-2/+19
| |\ \ \
| | * | | ID3: check possible integer overflow for extendedHeaderSize and paddingSize.Wei Jia2015-10-051-2/+19
* | | | | am 6f14568b: am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c:...Marco Nelissen2015-10-061-2/+9
|\ \ \ \ \ | |/ / / /
| * | | | am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82:...Marco Nelissen2015-10-061-2/+9
| |\ \ \ \
| | * \ \ \ am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e:...Marco Nelissen2015-10-061-2/+9
| | |\ \ \ \
| | | * \ \ \ am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size bef...Marco Nelissen2015-10-061-2/+9
| | | |\ \ \ \
| | | | * \ \ \ am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into...Marco Nelissen2015-10-061-2/+9
| | | | |\ \ \ \
| | | | | * \ \ \ am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | |\ \ \ \
| | | | | | * \ \ \ am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Check NAL size before useMarco Nelissen2015-10-061-2/+9
| | * | | | | | | | | | am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e:...Wei Jia2015-10-061-0/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: en...Wei Jia2015-10-061-0/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer s...Wei Jia2015-10-061-0/+6
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not le...Wei Jia2015-10-061-0/+6
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for...Wei Jia2015-10-061-0/+6
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentD...Wei Jia2015-10-061-0/+6
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.Wei Jia2015-10-061-0/+6
| | | | | | | | |/ / / /
* | | | | | | | | | | | am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e:...Marco Nelissen2015-10-061-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627:...Marco Nelissen2015-10-061-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5:...Marco Nelissen2015-10-061-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'...Marco Nelissen2015-10-061-0/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal ...Marco Nelissen2015-10-061-0/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | Don't crash when there's no conceal frameMarco Nelissen2015-10-051-0/+5
| | | | | | | |/ / / /
| | | | | | * | | | | am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+22
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+22
| | | | | | * | | | | am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-devJeff Tinker2015-09-171-0/+2
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | 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
| | | | | | * | | | | | am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MER...Jeff Tinker2015-09-171-1/+23
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /