summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 073dec19: am 22990fe1: Merge "Back to the old way of making sure that no m...Andreas Huber2013-11-121-2/+4
|\
| * am 22990fe1: Merge "Back to the old way of making sure that no more buffers a...Andreas Huber2013-11-121-2/+4
| |\
| | * Merge "Back to the old way of making sure that no more buffers are submitted"...Andreas Huber2013-11-121-2/+4
| | |\
| | | * Back to the old way of making sure that no more buffers are submittedAndreas Huber2013-11-081-2/+4
* | | | am db50cb5f: am caee8747: Merge "configure bitrate and bitrate mode at encode...Andreas Huber2013-11-111-0/+16
|\ \ \ \ | |/ / /
| * | | am caee8747: Merge "configure bitrate and bitrate mode at encoder initializat...Andreas Huber2013-11-111-0/+16
| |\ \ \ | | |/ /
| | * | Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9...Andreas Huber2013-11-121-0/+16
| | |\ \
| | | * | configure bitrate and bitrate mode at encoder initialization for VP8/9Andreas Huber2013-11-051-0/+16
* | | | | am cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data mo...Lajos Molnar2013-11-113-11/+35
|\ \ \ \ \ | |/ / / /
| * | | | am e100b813: Merge "StageFrightRecorder: do not use meta-data mode for softwa...Lajos Molnar2013-11-113-11/+35
| |\ \ \ \ | | |/ / /
| | * | | Merge "StageFrightRecorder: do not use meta-data mode for software encoders" ...Lajos Molnar2013-11-113-11/+35
| | |\ \ \
| | | * | | StageFrightRecorder: do not use meta-data mode for software encodersLajos Molnar2013-10-303-11/+35
* | | | | | am 5b5f76dc: am a7291156: Merge "TimedEventQueue: improve wakelock management...Eric Laurent2013-11-112-43/+55
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-devEric Laurent2013-11-102-43/+55
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "TimedEventQueue: improve wakelock management" into klp-devEric Laurent2013-11-112-43/+55
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | TimedEventQueue: improve wakelock managementEric Laurent2013-11-072-43/+55
* | | | | | Only initialize sniffers once, don't hold mutex while sniffingMarco Nelissen2013-11-111-16/+27
* | | | | | Merge "Remove default channel mask for AudioTrack"Glenn Kasten2013-11-081-7/+5
|\ \ \ \ \ \
| * | | | | | Remove default channel mask for AudioTrackGlenn Kasten2013-11-081-7/+5
* | | | | | | am 86f79f23: am 51ac2d64: Merge "Properly handle executing->idle in GraphicBu...Andreas Huber2013-11-083-7/+29
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 51ac2d64: Merge "Properly handle executing->idle in GraphicBufferSource" i...Andreas Huber2013-11-083-7/+29
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Properly handle executing->idle in GraphicBufferSource" into klp-devAndreas Huber2013-11-083-7/+29
| | |\ \ \ \ \
| | | * | | | | Properly handle executing->idle in GraphicBufferSourceAndreas Huber2013-11-073-7/+29
| | | | |/ / / | | | |/| | |
* | | | | | | am 2e496677: am 5572b3af: Replace assert with error messageAndy McFadden2013-11-081-1/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5572b3af: Replace assert with error messageAndy McFadden2013-11-081-1/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Replace assert with error messageAndy McFadden2013-11-071-1/+6
| | |/ / / /
* | | | | | 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
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |