summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-013-10/+94
|\ | | | | | | | | * commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de': Support CAST V2 Authentication in MediaDrm
| * am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-013-10/+94
| |\ | | | | | | | | | | | | * commit '68d9d71a792deed75d32fe13febc07c9c12c8449': Support CAST V2 Authentication in MediaDrm
| | * 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 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep ↵Lajos Molnar2014-03-282-55/+30
| |\ \ | | |/ | | | | | | | | | | | | | | | more buffers with the BufferQueue"" into klp-dev * commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| | * 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 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow ↵Lajos Molnar2014-03-282-10/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | for minUndequeuedBufs to be one less"" into klp-dev * commit '8bf96c011ff4128f9bf06b892a38d869192d6a25': DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
| | * | | 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 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite ↵Lajos Molnar2014-03-211-0/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | loop when parsing ADTS." into klp-dev * commit '3089021031d6ad0f2b330567f108aec03fa13994': DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
| | * | | 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 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more ↵Rachad2014-03-211-3/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | precisely 2^32-1 bytes -- FAT32 max file size) * commit '1bfb8f762dd21b39756fd8fd9990172cae1cef79': Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
| | * | | 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 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am ↵Marco Nelissen2014-03-201-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build * commit '9ec86fa05479cc468859c69009afda752ea46539': Fix build
| | * | 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 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ↵Marco Nelissen2014-03-201-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates * commit '994cbef7361b0f304883ea463488342347ed67b8': Verify certificates
| | * | | | | | | 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
* | | | | | | | | | | MediaCodec: move to UNINITIALIZED state on codec errorLajos Molnar2014-03-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec moves to Uninitialized state after receiving codec error. Make MediaCodec also move to the same state, so stop() and release() will work correctly. Bug: 13675112 Change-Id: I1c7e8b274f68345fc0e6a55c70dff6c7a4fb2e72
* | | | | | | | | | | ACodec: ignore OMX messages to already freed componentLajos Molnar2014-03-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12916984 Change-Id: I92848797b8d556cff468b9b0f0a618946083208f
* | | | | | | | | | | mediaplayer: add temporary developer settings to use NuPlayer as defaultLajos Molnar2014-03-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11784824 Change-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8
* | | | | | | | | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"Glenn Kasten2014-03-263-13/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>Glenn Kasten2014-03-263-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff
* | | | | | | | | | | | Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"Glenn Kasten2014-03-262-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOG_FATAL is compiled out in most builds, so the assertion checks were not being performed. Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
* | | | | | | | | | | | | Update commentsGlenn Kasten2014-03-264-2/+6
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
* | | | | | | | | | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-262-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-252-7/+7
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUDIO_INTERLEAVE_* AUDIO_STREAM_MIN AUDIO_SESSION_ALLOCATE Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
* | | | | | | | | | | | Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"Glenn Kasten2014-03-262-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use symbol AUDIO_DEVICE_NONE from <system/audio.h>Glenn Kasten2014-03-252-3/+3
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58
* | | | | | | | | | | | Merge "Remove stream type from AudioSystem::getRenderPosition()"Glenn Kasten2014-03-261-9/+1
|\ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-08 17:24:01 +0000