summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "stagefright: add a 2kb cache for CallbackDataSource."Chris Watkins2015-04-203-4/+80
|\
| * stagefright: add a 2kb cache for CallbackDataSource.Chris Watkins2015-04-203-4/+80
* | Merge "HLS: reduce number of guessed wrong seq numbers"Chong Zhang2015-04-186-190/+266
|\ \
| * | HLS: reduce number of guessed wrong seq numbersChong Zhang2015-04-176-190/+266
* | | am 4c85e16c: am d2dc1ea3: am 88574352: am 7725022e: Merge "SoftMPEG2: start o...Lajos Molnar2015-04-182-5/+21
|\ \ \
| * \ \ am 88574352: am 7725022e: Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| |\ \ \
| | * \ \ am 7725022e: Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| | |\ \ \
| | | * | | SoftMPEG2: start output at first I-frameVenkatarama Avadhani2015-04-172-5/+21
* | | | | | Merge "NuPlayer: queue a deferred scan sources when flushing during scan"Chong Zhang2015-04-187-31/+32
|\ \ \ \ \ \
| * | | | | | NuPlayer: queue a deferred scan sources when flushing during scanChong Zhang2015-04-177-31/+32
| | |_|_|/ / | |/| | | |
* | | | | | Merge "libmediaplayerservice: fix warnings, make warnings errors, use clang"Lajos Molnar2015-04-1723-45/+50
|\ \ \ \ \ \
| * | | | | | libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-1723-45/+50
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "stagefright: make more warnings errors"Lajos Molnar2015-04-1724-44/+46
|\ \ \ \ \ \
| * | | | | | stagefright: make more warnings errorsLajos Molnar2015-04-1724-44/+46
| |/ / / / /
* | | | | | libmedia: fix all warning, make warnings errors, use clangLajos Molnar2015-04-1712-16/+16
|/ / / / /
* | | | | stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-1777-194/+262
|/ / / /
* | | | Merge "NuPlayerDriver: Maintain the timeStamp after seek"Wei Jia2015-04-171-0/+3
|\ \ \ \
| * | | | NuPlayerDriver: Maintain the timeStamp after seekHaynes Mathew George2015-04-171-0/+3
* | | | | Merge "stagefright: initial timed id3 support in hls"Robert Shih2015-04-1718-84/+399
|\ \ \ \ \
| * | | | | stagefright: initial timed id3 support in hlsRobert Shih2015-04-1618-84/+399
| |/ / / /
* | | | | MediaSync: sanity check native sample rate.Wei Jia2015-04-161-0/+5
|/ / / /
* | | | MediaCodec: hold input buffers during FLUSHED stateChong Zhang2015-04-161-2/+11
* | | | Merge "Work around lack of pitch adjustment in Timestretcher"Andy Hung2015-04-161-12/+40
|\ \ \ \
| * | | | Work around lack of pitch adjustment in TimestretcherAndy Hung2015-04-161-12/+40
* | | | | am 6705a49f: am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end ...Marco Nelissen2015-04-164-1/+33
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out...Marco Nelissen2015-04-164-1/+33
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | |\ \
| | | | * | Signal EOS at end of mpeg video to flush out final sampleMarco Nelissen2015-04-154-1/+33
* | | | | | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-1625-26/+469
|\ \ \ \ \ \
| * | | | | | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-1525-26/+469
* | | | | | | am 5c16a387: am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: fr...Lajos Molnar2015-04-161-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | |\ \ \ \
| | | | * | | | libstagefright: free mMoovBoxBufferSuresh Choudhary2015-04-161-0/+2
* | | | | | | | am f16511ca: am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set t...Lajos Molnar2015-04-161-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate ...Lajos Molnar2015-04-161-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera re...Lajos Molnar2015-04-161-2/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"Lajos Molnar2015-04-161-2/+4
| | | |\ \ \ \ \
| | | | * | | | | MPEG4Writer: Set the correct audio bit rate for camera recorded contentDaniel Bonnevier2015-04-151-2/+4
| | | | | |_|/ / | | | | |/| | |
* | | | | | | | am 655084f9: am e7a53499: am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,I...Lajos Molnar2015-04-1611-11/+3668
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | stagefright: add SoftAVCEnc using libavcVenkatarama Avadhani2015-04-155-6/+1680
| | | * | | | | stagefright: add SoftAVCDec using libavcVenkatarama Avadhani2015-04-155-5/+1017
| | | * | | | | stagefright: add SoftMPEG2 decoder using libmpeg2Venkatarama Avadhani2015-04-155-0/+971
| | | |/ / / /
| * | | | | | am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3:...Nick Kralevich2015-04-111-0/+6
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underf...Nick Kralevich2015-04-111-0/+6
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS p...Nick Kralevich2015-04-101-0/+6
| | | |\ \ \ \ \ \