summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-0/+16
| | | | | Change-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394 related-to-bug: 12702350
* Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-293-10/+94
| | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861 related-to-bug: 12702350
* am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers ↵Lajos Molnar2014-03-282-55/+30
|\ | | | | | | | | | | | | with the BufferQueue"" into klp-dev * commit 'f780d28de2e3cf7f6b26b9626321dba75719736e': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| * Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the ↵Lajos Molnar2014-03-282-55/+30
| |\ | | | | | | | | | BufferQueue"" into klp-dev
| | * DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-272-55/+30
| | | | | | | | | | | | | | | | | | This reverts commit b635b0e66b257ab442e230bca96afd5105cf6829. Bug: 13655631
* | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for ↵Lajos Molnar2014-03-282-10/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | minUndequeuedBufs to be one less"" into klp-dev * commit '3d4e4fcbcfc5c16dd794591727f5c713831ab6dc': DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
| * | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be ↵Lajos Molnar2014-03-282-10/+7
| |\ \ | | |/ | | | | | | one less"" into klp-dev
| | * DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"Lajos Molnar2014-03-272-10/+7
| | | | | | | | | | | | | | | | | | This reverts commit a0470879e25394cb85437366fa53ce8055cd556f. Bug: 13655631
* | | am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when ↵Lajos Molnar2014-03-211-0/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | parsing ADTS." into klp-dev * commit '333ceb4f66ccf790081026f645474e07d832fbdb': DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
| * | Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." ↵Lajos Molnar2014-03-211-0/+12
| |\ \ | | |/ | |/| | | | into klp-dev
| | * DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-211-0/+12
| | | | | | | | | | | | | | | | | | First check for embedded ID3 tag, then bail out if invalid. Bug: 12934795 Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
* | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely ↵Rachad2014-03-211-3/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | 2^32-1 bytes -- FAT32 max file size) * commit 'f622e2c78407b50806a53a06a89b2b6546420f55': Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
| * | Increased recorded MP4 max file size to 4GBRachad2014-03-211-3/+5
| |/ | | | | | | | | | | | | | | (more precisely 2^32-1 bytes -- FAT32 max file size) bug: 11039801 Change-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598 (cherry picked from commit 1f1f2b1678fd0d038dfc501252dd2b65ecf10cae)
* | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am ↵Marco Nelissen2014-03-201-0/+1
|\ \ | |/ | | | | | | | | | | 42ba5806: am 72499628: am 25bab830: Fix build * commit 'a577eefbaca24d1b9ac947daca54be1992888748': Fix build
| * am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am ↵Marco Nelissen2014-03-201-0/+1
| |\ | | | | | | | | | | | | | | | | | | 72499628: am 25bab830: Fix build * commit '5be9c1daf956c35d37585d21fff5d6b99f506560': Fix build
| | * am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am ↵Marco Nelissen2014-03-201-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 25bab830: Fix build * commit '01eed3c0fb951e349d68f4bce818bef22e7925b1': Fix build
| | | * am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '7a107b857e658ba11c0c1fd2325ac91a2c0569a2': Fix build
| | | | * am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '854aa061b1e2d7eaaf8ffa2ead323c1478393c57': Fix build
| | | | | * am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25bab830af062dcaef6f75220066b221fd30957e': Fix build
| | | | | | * Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of jb-mr1, need to explicitly include library dependencies. The original change in jb, which the automerger dutyfully merged, did not need this. Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7
* | | | | | | am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am ↵Marco Nelissen2014-03-201-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates * commit '2853e48c855fc95f2bd7bf9438a878f2a79d75a7': Verify certificates
| * | | | | | am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am ↵Marco Nelissen2014-03-201-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates * commit '6f65db14e310b513c8943b236a6e61cf27cef4c7': Verify certificates
| | * | | | | am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am ↵Marco Nelissen2014-03-201-2/+102
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates * commit '0e0891f8b49f31e6a28b563f86aae537e66bb6e0': Verify certificates
| | | * | | | am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am ↵Marco Nelissen2014-03-201-2/+102
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bc4f7ea: am 0c271b75: Verify certificates * commit '6cdc90b5e41374dd665df3ae7283ef0c1f532678': Verify certificates
| | | | * | | am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am ↵Marco Nelissen2014-03-201-2/+102
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c271b75: Verify certificates * commit 'ebc9b47330ab8565f7bdd9b3973a8f75e3206e77': Verify certificates
| | | | | * | am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | |\ \ | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | * commit 'd434944b00cf83a38019047e0d7db155a15d77f4': Verify certificates
| | | | | | * am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed': Verify certificates
| | | | | | | * am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c271b750f7314e187f8479f478ad9382d9a9045': Verify certificates
| | | | | | | | * Verify certificatesMarco Nelissen2014-03-191-2/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Cherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3 https://googleplex-android-review.git.corp.google.com/#/c/433309/ Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
| | | | | * | | | Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-293-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an MP3 source, within the prepare command, ID3 tags are checked in search of gapless playback info. This causes problems for streamed sources. If ID3v2 tags aren't present, then a check is done for ID3v1 tags. This results in a read command that asks the cache to jump to the end of the file, and subsequently make an extra http call to request those bytes. For a streamed source, this causes the file to not be downloaded automatically when MediaPlayer::prepare() is called, and causes stuttering and extra buffering time to be needed when start() is finally called. The solution is to ignore the ID3v1 tags as the gapless info would never exist there, and only check for ID3v2 tags. Cherrypicked from external contribution ffd6ffc5429c45577fd8e9f8fa90e79bb91b8a84 b/7638165 Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
* | | | | | | | | am 1faa4170: stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1faa41704e0b976e546321effcb09a85767d51ba': stagefright: allow for minUndequeuedBufs to be one less
| * | | | | | | | stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13533477 Change-Id: I909324e3e24f65d8051e0d5474267620efcfc729
* | | | | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-192-30/+55
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b635b0e66b257ab442e230bca96afd5105cf6829': mediaplayer: keep more buffers with the BufferQueue
| * | | | | | | | mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-192-30/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change OMX buffer allocation policy to allocate nBufferCountMin + what is required for the BQ. For the BQ, try to allocate 2 additional buffers than the minimum undequeued count. Also account for the fact that BQ may return one less than the actual minimum undequeued count. In most cases the resulting number of buffers ends up being the same as with the previous policy, but we keep more buffers with the BQ. Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d Bug: 13170236
* | | | | | | | | am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8': httplive: block-by-block fetch, decrypt, and parse ts files.
| * | | | | | | | httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12060952 Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
* | | | | | | | | am 75dcf510: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '75dcf5101c90e31bbac95694d835b0e8f57ba720': Verify certificates
| * | | | | | | | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Verify certificatesMarco Nelissen2014-03-132-1/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
* | | | | | | | | | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70cc5bdc0fca3f67f3602f04152c29323cad99df': LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| * | | | | | | | | Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-122-1/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| | * | | | | | | | | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
| | * | | | | | | | | M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
* | | | | | | | | | | am 67a10c52: Merge "httplive: clear access units before returning from ↵Lajos Molnar2014-03-144-15/+42
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekTo." into klp-dev * commit '67a10c522898d8223f5a2d389a846b7e2327148a': httplive: clear access units before returning from seekTo.
| * | | | | | | | | | Merge "httplive: clear access units before returning from seekTo." into klp-devLajos Molnar2014-03-124-15/+42
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | httplive: clear access units before returning from seekTo.Robert Shih2014-03-114-15/+42
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12060952 Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
* | | | | | | | | | am cf49a51f: fix codec buffer leak in error handling when timestamp goes ↵Chong Zhang2014-03-131-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backward * commit 'cf49a51ff59c3cd228d178d23252ac0d39d5a893': fix codec buffer leak in error handling when timestamp goes backward
| * | | | | | | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-03-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't touch codec buffer if we decided to drop a frame with bad pts Bug: 11971963 Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6 (cherry picked from commit b63d2433350d56bda9f3477549086c90bb6d535e)
* | | | | | | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" ↵Chong Zhang2014-03-134-6/+167
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec': Cap pts gap between adjacent frames to specified value
| * | | | | | | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-devChong Zhang2014-03-114-6/+167
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-06-09 08:00:53 +0000