summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Fix warnings about unused parametersGlenn Kasten2014-02-072-10/+16
* 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-0610-196/+1152
|\ \ | |/ |/|
| * Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-0510-196/+1152
* | Merge "Fix restart after EOS for mp3"Marco Nelissen2014-02-061-0/+3
|\ \
| * | Fix restart after EOS for mp3Marco Nelissen2014-02-051-0/+3
* | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-0627-1655/+14
|\ \ \
| * | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-0527-1655/+14
| | |/ | |/|
* | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-051-7/+16
|\ \ \ | |/ / |/| |
| * | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-051-7/+16
| |/
* | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-0556-112/+827
|\ \ | |/ |/|
| * FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0456-112/+827
* | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-045-6/+6
|\ \
| * | Fix unused parameter warnings in audioGlenn Kasten2014-02-035-6/+6
* | | Merge "Change Format_Invalid from enum to global const"Glenn Kasten2014-02-041-0/+2
|\ \ \
| * | | Change Format_Invalid from enum to global constGlenn Kasten2014-02-031-0/+2
* | | | 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 "Use const NBAIO_Format& in parameter lists"Glenn Kasten2014-02-034-7/+7
|\ \ \
| * | | Use const NBAIO_Format& in parameter listsGlenn Kasten2014-01-314-7/+7
* | | | 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
* | | | | | | | am af1aa00e: am c4eef29a: Merge "fix deadlock issues that arise when there ar...Eric Laurent2014-02-035-31/+88
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c4eef29a: Merge "fix deadlock issues that arise when there are simultaneou...Eric Laurent2014-02-035-31/+88
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-315-31/+88
| * | | | | | | Merge "Support for MPEG2 video" into klp-modular-devDongwon Kang2014-01-292-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Support for MPEG2 videoChangwan Ryu2014-01-212-0/+4
* | | | | | | | | Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-031-6/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-01-281-6/+13
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | 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
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge "AudioTrack: fix obtainBuffer timeout calculation"Eric Laurent2014-01-282-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-01-272-2/+2
* | | | | | am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MO...Colin Cross2014-01-287-9/+9
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_...Colin Cross2014-01-287-9/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-277-9/+9
* | | | | 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
| |\ \ \ \ | | |/ / /
| | * | | 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 9f875b27: am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakT...Eric Laurent2014-01-271-3/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |