summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support TS + AC3 for ATSC standard"Changwan Ryu2013-11-065-0/+253
|\
| * Support TS + AC3 for ATSC standardChangwan Ryu2013-11-065-0/+253
* | Merge "Support AC3 in stagefright"Changwan Ryu2013-11-062-1/+71
|\ \ | |/
| * Support AC3 in stagefrightChangwan Ryu2013-11-062-1/+71
* | Merge "Clean up channel mask handling"Glenn Kasten2013-11-061-4/+3
|\ \
| * | Clean up channel mask handlingGlenn Kasten2013-10-301-4/+3
* | | am 92168885: am f8a1169d: Merge "Notify current video size if available" into...Marco Nelissen2013-11-041-1/+10
|\ \ \
| * \ \ am f8a1169d: Merge "Notify current video size if available" into klp-devMarco Nelissen2013-11-041-1/+10
| |\ \ \
| | * \ \ Merge "Notify current video size if available" into klp-devMarco Nelissen2013-11-041-1/+10
| | |\ \ \
| | | * | | Notify current video size if availableMarco Nelissen2013-11-011-1/+10
* | | | | | am 2922d230: am 065789f2: Merge "Restore NuPlayer error and EOS handling" int...Lajos Molnar2013-11-042-4/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am 065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-devLajos Molnar2013-11-042-4/+10
| |\ \ \ \ | | |/ / /
| | * | | Restore NuPlayer error and EOS handlingLajos Molnar2013-10-302-4/+10
* | | | | Support for MPEG2 videoChangwan Ryu2013-10-312-0/+4
* | | | | am 8578eb36: am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works ...Lajos Molnar2013-10-301-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" ...Lajos Molnar2013-10-301-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-devLajos Molnar2013-10-301-0/+5
| | |\ \ \ | | | |/ / | | |/| |
| | | * | AwesomePlayer: ensure STARTED message works after resetLajos Molnar2013-10-281-0/+5
* | | | | am b6b97f60: am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to o...Lajos Molnar2013-10-291-0/+6
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| |\ \ \
| | * \ \ am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| | |\ \ \
| | | * \ \ Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| | | |\ \ \
| | | | * | | avcenc: Prepend startcodes to output buffersMartin Storsjo2013-09-251-0/+6
| * | | | | | am 9cae2170: Assign blame for playback wakelocks.Marco Nelissen2013-10-264-14/+33
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Assign blame for playback wakelocks.Marco Nelissen2013-10-254-14/+33
* | | | | | | Assign blame for playback wakelocks.Marco Nelissen2013-10-254-14/+33
* | | | | | | am de5f7cd6: am be567be3: Merge "Check for NULL buffer in repeat-latest" into...Andy McFadden2013-10-241-0/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Check for NULL buffer in repeat-latestAndy McFadden2013-10-231-0/+17
* | | | | | | am 57c1f758: am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into...Vineeta Srivastava2013-10-241-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix kAutoRampDurationUs overflow issueVineeta Srivastava2013-10-181-2/+2
* | | | | | | am c20636f7: am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, l...Elliott Hughes2013-10-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason...Elliott Hughes2013-10-231-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."Elliott Hughes2013-10-231-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | If dlopen("libwvm.so") fails, log the reason why.Elliott Hughes2013-10-231-1/+1
* | | | | | | am 173f0125: am 9857473f: am 0f4b0d23: Merge "libeffects: do not use GNU old-...Nick Kralevich2013-10-205-35/+35
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 9857473f: am 0f4b0d23: Merge "libeffects: do not use GNU old-style field d...Nick Kralevich2013-10-205-35/+35
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-10-205-35/+35
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | libeffects: do not use GNU old-style field designatorssynergydev2013-10-195-35/+35
* | | | | | | am 77177fa2: am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-181-3/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-181-3/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Allow releaseBuffer after flushGlenn Kasten2013-10-181-3/+7
| | | |_|/ / | | |/| | |
* | | | | | am 694d0295: am 6fa20187: Make sure we get to discover that the cache is suff...Andreas Huber2013-10-171-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6fa20187: Make sure we get to discover that the cache is sufficiently full...Andreas Huber2013-10-171-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Make sure we get to discover that the cache is sufficiently full againAndreas Huber2013-10-171-1/+1
* | | | | | am b2059ff3: am f8f15b05: Merge "Fix race condition in AudioTrack::pause foll...Glenn Kasten2013-10-161-7/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start...Glenn Kasten2013-10-161-7/+8
| |\ \ \ \ \ | | |/ / / /