summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-102-1/+3
|\
| * am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-073-4/+3
| |\
| | * frameworks/av: fix errors inside ALOGVColin Cross2014-02-063-4/+3
| * | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-045-0/+253
| |\ \
| | * | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-035-0/+253
| * | | am 90903383: [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-042-1/+71
| |\ \ \ | | |/ /
| | * | [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-032-1/+71
* | | | Merge "set AAC MPEG version to MPEG-2"Chong Zhang2014-02-071-1/+1
|\ \ \ \
| * | | | set AAC MPEG version to MPEG-2Chong Zhang2014-02-071-1/+1
* | | | | Merge "Remove libstagefright_http_support from the PDK build."Andreas Huber2014-02-061-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove libstagefright_http_support from the PDK build.Andreas Huber2014-02-061-0/+4
* | | | | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-068-20/+972
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-058-20/+972
* | | | | Merge "Fix restart after EOS for mp3"Marco Nelissen2014-02-061-0/+3
|\ \ \ \ \
| * | | | | Fix restart after EOS for mp3Marco Nelissen2014-02-051-0/+3
* | | | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-0517-1574/+6
| |/ / / / |/| | | |
* | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-0525-63/+426
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0425-63/+426
* | | | | Merge "Allow for larger codec private data"Marco Nelissen2014-02-041-30/+50
|\ \ \ \ \
| * | | | | Allow for larger codec private dataMarco Nelissen2014-02-031-30/+50
| |/ / / /
* | | | | Merge "MPEG4Writer: use "mp42" as major/minor brand in ftyp box."Robert Shih2014-02-031-3/+6
|\ \ \ \ \
| * | | | | MPEG4Writer: use "mp42" as major/minor brand in ftyp box.Robert Shih2014-01-301-3/+6
* | | | | | Merge "Added support to query ACodec whether adaptive playback is enabled."Robert Shih2014-02-031-0/+5
|\ \ \ \ \ \
| * | | | | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-01-291-0/+5
* | | | | | | Merge "Fixed misplaced bracket for switch-case block."Robert Shih2014-02-031-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed misplaced bracket for switch-case block.Robert Shih2014-01-241-4/+4
* | | | | | | am 324d9157: am 5db1e3a6: Merge "correct one logic error in decide whether sh...Lajos Molnar2014-02-032-2/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 5db1e3a6: Merge "correct one logic error in decide whether should render o...Lajos Molnar2014-02-032-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
| * | | | | Merge "Support for MPEG2 video" into klp-modular-devDongwon Kang2014-01-292-0/+4
| |\ \ \ \ \
| | * | | | | Support for MPEG2 videoChangwan Ryu2014-01-212-0/+4
* | | | | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-01-304-6/+167
| |_|_|_|_|/ |/| | | | |
* | | | | | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-01-281-0/+6
| |_|_|_|/ |/| | | |
* | | | | am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when ...Eric Laurent2014-01-271-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | | am 6146f60c: am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta da...Marco Nelissen2014-01-175-9/+89
|\ \ \ \ | |/ / /
| * | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
| |\ \ \ | | |/ /
| | * | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-165-9/+89
* | | | Merge "AudioRecord::getInputFramesLost() cleanup"Glenn Kasten2014-01-171-1/+1
|\ \ \ \
| * | | | AudioRecord::getInputFramesLost() cleanupGlenn Kasten2014-01-141-1/+1
* | | | | am 07634f1f: am cbf9e91a: am 1e8a57c2: Merge "Avoid jumps to faulty position ...Marco Nelissen2014-01-151-1/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| |\ \ \ | | |/ /
| | * | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| | |\ \
| | | * | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
* | | | | am 9dfe2ae1: am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with ...Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
| | |\ \ \
| | | * | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | | |/ /
* | | | | Support more channel configurations in MPEG4ExtractorJean-Michel Trivi2014-01-081-1/+158
| |_|_|/ |/| | |