summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am fb08bd76: (-s ours) am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am...Marco Nelissen2014-03-200-0/+0
|\
| * am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473:...Marco Nelissen2014-03-201-1/+2
| |\
| | * am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:...Marco Nelissen2014-03-201-1/+2
| | |\
| | | * am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80:...Marco Nelissen2014-03-201-1/+2
| | | |\
| | | | * am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b:...Marco Nelissen2014-03-201-2/+102
| | | | |\
| | | | | * am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea:...Marco Nelissen2014-03-201-2/+102
| | | | | |\
| | | | | | * am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75:...Marco Nelissen2014-03-201-2/+102
| | | | | | |\
| | | | | | | * am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certi...Marco Nelissen2014-03-201-2/+102
| | | | | | | |\
| | | | | | | | * am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | |\
| | | | | | | | | * am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | | |\
| | | | | | | | | | * am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | | | |\
| | | | | | | | | | | * am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | | | | |\
| | | | | | | | | | | | * Verify certificatesMarco Nelissen2014-03-191-2/+102
* | | | | | | | | | | | | Merge "A few fixes in SW VP8 encoder:"Alex Glaznev2014-03-202-17/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | A few fixes in SW VP8 encoder:Alex Glaznev2014-03-192-17/+77
* | | | | | | | | | | | | | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-203-47/+267
* | | | | | | | | | | | | | libstagefright: fix 64-bit warningsColin Cross2014-03-1919-73/+87
* | | | | | | | | | | | | | Merge "Add MediaPlayer::getAudioStreamType."John Spurlock2014-03-192-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add MediaPlayer::getAudioStreamType.John Spurlock2014-03-192-0/+9
* | | | | | | | | | | | | | | Merge commit 'c250980f' into manualmergeGlenn Kasten2014-03-196-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 24e1bd71: Merge "libstagefright is no longer 32 bit only."Glenn Kasten2014-03-197-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "libstagefright is no longer 32 bit only."Glenn Kasten2014-03-197-13/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | libstagefright is no longer 32 bit only.Narayan Kamath2014-03-197-13/+0
* | | | | | | | | | | | | | | | | am 08298357: am bd7bde79: Merge "Use libaudioresampler instead of libaudiofli...Glenn Kasten2014-03-194-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger"Glenn Kasten2014-03-194-11/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge "Use libaudioresampler instead of libaudioflinger"Glenn Kasten2014-03-194-11/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Use libaudioresampler instead of libaudioflingerGlenn Kasten2014-03-194-11/+3
* | | | | | | | | | | | | | | | | Merge "Use more tags to help the ICU detector."Marco Nelissen2014-03-192-20/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use more tags to help the ICU detector.Marco Nelissen2014-03-192-20/+99
* | | | | | | | | | | | | | | | | | am bd1f8f0a: am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBu...Lajos Molnar2014-03-192-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one ...Lajos Molnar2014-03-192-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 1faa4170: stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
* | | | | | | | | | | | | | | | | | resolved conflicts for merge of f40c4c56 to masterGlenn Kasten2014-03-191-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 36817364: Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Add libaudioresamplerGlenn Kasten2014-03-191-11/+18
| | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | stagefright: add include support for MediaCodecList xml parserLajos Molnar2014-03-192-39/+110
| |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 129c7653: am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with th...Lajos Molnar2014-03-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-193-30/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-193-30/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-193-30/+56
* | | | | | | | | | | | | | | | am 49b2e310: am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decryp...Robert Shih2014-03-195-188/+285
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ...Robert Shih2014-03-195-188/+285
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
* | | | | | | | | | | | | | | | am c7c839dc: am b2ecad7f: Merge "libstagefright_foundation: fix printf format...Colin Cross2014-03-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"Colin Cross2014-03-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "libstagefright_foundation: fix printf format for 64-bit"Colin Cross2014-03-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | libstagefright_foundation: fix printf format for 64-bitColin Cross2014-03-181-1/+1
| | |/ / / / / / / / / / / / /