summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Level adjustment for Bundled Effect FixRicardo Garcia2015-05-222-12/+56
* Merge "Implement seek for MPEG2TSExtractor" into mnc-devWonsik Kim2015-05-224-73/+390
|\
| * Implement seek for MPEG2TSExtractorWonsik Kim2015-05-204-73/+390
* | Merge "stagefright: measure max encoder buffer count for persistent surface" ...Chong Zhang2015-05-224-13/+105
|\ \
| * | stagefright: measure max encoder buffer count for persistent surfaceChong Zhang2015-05-214-13/+105
* | | Merge "mediaplayer: display one frame when seek is called before start." into...Wei Jia2015-05-223-19/+33
|\ \ \
| * | | mediaplayer: display one frame when seek is called before start.Wei Jia2015-05-213-19/+33
| |/ /
* | | Merge "audio flinger: do not call JAVA services until system is ready" into m...Eric Laurent2015-05-212-1/+20
|\ \ \ | |/ / |/| |
| * | audio flinger: do not call JAVA services until system is readyEric Laurent2015-05-202-1/+20
* | | Merge "RTSPSource: Do not update time when there are no tracks, i.e., when ab...Wei Jia2015-05-201-1/+1
|\ \ \
| * | | RTSPSource: Do not update time when there are no tracks, i.e., when aborted.Wei Jia2015-05-191-1/+1
* | | | Merge "mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buf...Wei Jia2015-05-191-0/+5
|\ \ \ \
| * | | | mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer fro...Wei Jia2015-05-181-0/+5
| | |/ / | |/| |
* | | | Merge "libmediaplayerservice: queue discontinuity when seek to eos." into mnc...Ronghua Wu2015-05-192-11/+20
|\ \ \ \
| * | | | libmediaplayerservice: queue discontinuity when seek to eos.Ronghua Wu2015-05-192-11/+20
* | | | | Merge "stagefright: don't use stale pointer after disconnecting NuCachedSourc...Chong Zhang2015-05-191-0/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | stagefright: don't use stale pointer after disconnecting NuCachedSource2Chong Zhang2015-05-191-0/+7
* | | | | Merge "ACodec: fix error conversion." into mnc-devWei Jia2015-05-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ACodec: fix error conversion.Wei Jia2015-05-191-1/+1
| | |/ / | |/| |
* | | | Merge "Clear mAudioRecord and mAudioTrack on set() failure" into mnc-devGlenn Kasten2015-05-183-1/+11
|\ \ \ \
| * | | | Clear mAudioRecord and mAudioTrack on set() failureGlenn Kasten2015-05-183-1/+11
| |/ / /
* | | | Merge "libstagefright: only log succeeded when return is OK." into mnc-devRonghua Wu2015-05-181-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | libstagefright: only log succeeded when return is OK.Ronghua Wu2015-05-181-1/+3
| |/ /
* | | Merge "mediaplayer: remove unused parameter needNotify in NuPlayer::performSe...Wei Jia2015-05-162-13/+10
|\ \ \
| * | | mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek.Wei Jia2015-05-152-13/+10
| | |/ | |/|
* | | Merge "MPEG4Writer: fix unintiialized member variables" into mnc-devChong Zhang2015-05-151-0/+7
|\ \ \
| * | | MPEG4Writer: fix unintiialized member variablesChong Zhang2015-05-151-0/+7
| |/ /
* | | 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
* | | | Merge "stagefright: check IMemory::pointer() before using the allocation" int...Chong Zhang2015-05-151-2/+2
|\ \ \ \
| * | | | stagefright: check IMemory::pointer() before using the allocationChong Zhang2015-05-151-2/+2
| | |/ / | |/| |
* | | | 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
| |/ /
* | | 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
* | | | 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
* | | | Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into...Chong Zhang2015-05-1316-52/+49
|\ \ \ \ | |/ / / |/| | |
| * | | stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-1316-52/+49
* | | | Merge "libmediaplayerservice: unlock before trying to reclaim drm session." i...Ronghua Wu2015-05-131-0/+11
|\ \ \ \
| * | | | libmediaplayerservice: unlock before trying to reclaim drm session.Ronghua Wu2015-05-131-0/+11
| | |_|/ | |/| |
* | | | am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0:...Lajos Molnar2015-05-132-6/+87
|\ \ \ \
| * \ \ \ am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add A...Lajos Molnar2015-05-122-6/+87
| |\ \ \ \
| | * \ \ \ am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect ...Lajos Molnar2015-05-122-6/+87
| | |\ \ \ \
| | | * \ \ \ am 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPE...Lajos Molnar2015-05-122-6/+87
| | | |\ \ \ \
| | | | * \ \ \ Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes"...Lajos Molnar2015-05-122-6/+87
| | | | |\ \ \ \
| | | | | * | | | Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizesLajos Molnar2015-04-242-6/+87
* | | | | | | | | 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
* | | | | | | | | | Merge "Fix new[] vs delete mismatch." into mnc-devEvgenii Stepanov2015-05-121-1/+1
|\ \ \ \ \ \ \ \ \ \