summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* stagefright: handle corrupt matroska files gracefullyLajos Molnar2014-04-041-5/+13
* stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-046-15/+46
* stagefright: add AString constructor from String8Lajos Molnar2014-04-041-0/+8
* Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-046-41/+41
|\
| * Remove deprecated BufferQueue constructorDan Stoza2014-03-126-41/+41
* | Merge commit '52a23bd3' into manualmergeGlenn Kasten2014-04-037-15/+15
|\ \
| * \ am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-037-16/+16
| |\ \
| | * | 64-bit: Correction to OMX_U32 and OMX_S32Glenn Kasten2014-04-027-16/+16
| * | | am 93bbc834: Merge "Fix aac decoder flush"Glenn Kasten2014-04-031-0/+6
| |\ \ \ | | |/ /
| | * | Fix aac decoder flushMarco Nelissen2014-04-021-0/+6
* | | | am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer ...Jeff Tinker2014-04-031-0/+16
|\ \ \ \ | |/ / /
| * | | am 81e0bd44: Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-031-0/+16
| |\ \ \
| | * | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-0/+16
| * | | | am 2b2fbe29: Merge "Fix decoder EOS handling"Glenn Kasten2014-04-026-203/+213
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix decoder EOS handlingMarco Nelissen2014-04-026-203/+213
* | | | | Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"Lajos Molnar2014-04-021-4/+12
|\ \ \ \ \
| * | | | | ACodec: do not signal kWhatShutdownCompleted on codec errorLajos Molnar2014-04-011-4/+12
* | | | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-013-10/+94
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-013-10/+94
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-293-10/+94
| * | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-282-55/+30
| |\ \ \ \ | | |/ / /
| | * | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-282-55/+30
| | |\ \ \
| | | * \ \ Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQu...Lajos Molnar2014-03-282-55/+30
| | | |\ \ \
| | | | * | | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-272-55/+30
| * | | | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for...Lajos Molnar2014-03-282-10/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeue...Lajos Molnar2014-03-282-10/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be o...Lajos Molnar2014-03-282-10/+7
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"Lajos Molnar2014-03-272-10/+7
| * | | | | | am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite ...Lajos Molnar2014-03-211-0/+12
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par...Lajos Molnar2014-03-211-0/+12
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i...Lajos Molnar2014-03-211-0/+12
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-211-0/+12
| * | | | | | am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more p...Rachad2014-03-211-3/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32...Rachad2014-03-211-3/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Increased recorded MP4 max file size to 4GBRachad2014-03-211-3/+5
| | | |/ / /
| * | | | | am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061:...Marco Nelissen2014-03-201-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:...Marco Nelissen2014-03-201-0/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:...Marco Nelissen2014-03-201-0/+1
| | | |\ \ \
| | | | * \ \ am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:...Marco Nelissen2014-03-201-0/+1
| | | | |\ \ \
| | | | | * \ \ am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | |\ \ \
| | | | | | * \ \ am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | |\ \ \
| | | | | | | * \ \ am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | | |\ \ \
| | | | | | | | * | | Fix buildMarco Nelissen2014-03-201-0/+1
| * | | | | | | | | | 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 d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /