summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am ad21a81a: Merge "stagefright: Fix issue with tracking media format in pack...Lajos Molnar2014-03-072-13/+44
|\
| * Merge "stagefright: Fix issue with tracking media format in packet source" in...Lajos Molnar2014-03-072-13/+44
| |\
| | * stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2014-03-062-13/+44
* | | am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp...Lajos Molnar2014-03-072-29/+105
|\ \ \ | |/ /
| * | Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-devLajos Molnar2014-03-072-29/+105
| |\ \ | | |/
| | * stagefright: Fix bugs in playlist fetcher logicLajos Molnar2014-03-062-29/+105
| * | Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-072-0/+14
| |\ \ | | |/ | |/|
| | * stagefright: do not offload LD-AAC decodingEric Laurent2014-03-062-0/+14
| * | Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-devEric Laurent2014-03-061-17/+23
| |\ \ | | |/
| | * stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2014-03-051-17/+23
* | | am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
|\ \ \ | |/ /
| * | set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| |/
| * Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-051-4/+7
* | am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
|\ \
| * \ am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| |\ \ | | |/
| | * AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| | * libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2014-03-052-6/+9
| | * update offloaded audio track sampling rateEric Laurent2014-03-054-2/+42
* | | am 6b260425: am 85b3013e: fix deadlock issues that arise when there are simul...jpadmana2014-03-055-31/+88
|\ \ \ | |/ /
| * | am 85b3013e: fix deadlock issues that arise when there are simultaneous effec...jpadmana2014-03-055-31/+88
| |\ \ | | |/
| | * fix deadlock issues that arise when there are simultaneousjpadmana2014-03-045-31/+88
| | * AudioTrack: fix position callback after restoreEric Laurent2013-11-271-1/+0
* | | Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-111-1/+1
* | | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-035-0/+253
* | | [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-032-1/+71
* | | Merge "Support for MPEG2 video" into klp-modular-devDongwon Kang2014-01-292-0/+4
|\ \ \ | |/ / |/| |
| * | Support for MPEG2 videoChangwan Ryu2014-01-212-0/+4
* | | 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 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 d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
| |/ /
* | | am 96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
|\ \ \ | |/ /
| * | Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
| |\ \
| | * | Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26
* | | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am 4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
* | | | | 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 e311b15c: Merge "Fix c++11 narrowing"Nick Kralevich2014-01-101-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix c++11 narrowing"Nick Kralevich2014-01-111-1/+1
| |\ \ \ \
| | * | | | Fix c++11 narrowingsynergydev2013-10-251-1/+1
* | | | | | am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / /