summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-0442-144/+144
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0312-42/+42
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* Merge "audio effects: rename configure command"Eric Laurent2011-12-197-75/+263
|\
| * audio effects: rename configure commandEric Laurent2011-12-197-75/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | Renamed audio effect library interface command for audio format configuration from EFFECT_CMD_CONFIGURE to EFFECT_CMD_SET_CONFIG. This makes the naming more consistent with other exixsting commands and allow adding a new command to get the configuration (EFFECT_CMD_GET_CONFIG). Same change for reverse channel configuration renamed from EFFECT_CMD_CONFIGURE_REVERSE to EFFECT_CMD_SET_CONFIG_REVERSE. Implemented EFFECT_CMD_GET_CONFIG in exisitng effect libraries. Change-Id: Ia7b1c620f13797fe5aceb3b0b4acbacce09fb067
* | Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test ↵Hong Teng2011-12-161-0/+7
|\ \ | | | | | | | | | failed."
| * | Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.Hong Teng2011-12-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | -Fix the index is out of sync frame array boundary when seeking to end of a 3gp file. Validation only were done for video editor cts test and Movie Studio application. Futher validation may include media player, youtube application,.etc. Change-Id: Ib01314f1768cfab702dbe25c307553ace0b85e77
* | | am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE ↵Dave Burke2011-12-151-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | usage bit" into ics-mr1 * commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1': SurfaceMediaSource: use the HW_TEXTURE usage bit
| * | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
* | | Merge "Fix build error when verbose logging is enabled"Glenn Kasten2011-12-151-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix build error when verbose logging is enabledGlenn Kasten2011-12-151-1/+1
| | | | | | | | | | | | Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
* | | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-141-1/+0
|\ \ \
| * | | Fix indentation and whitespaceGlenn Kasten2011-12-141-1/+0
| |/ / | | | | | | | | | | | | | | | Use git diff -w to verify. Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
* | | Merge "Audio C++ comments"Glenn Kasten2011-12-141-1/+1
|\ \ \
| * | | Audio C++ commentsGlenn Kasten2011-12-141-1/+1
| |/ / | | | | | | | | | Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
* | | Merge "Remove unnecessary this->"Glenn Kasten2011-12-141-15/+15
|\ \ \
| * | | Remove unnecessary this->Glenn Kasten2011-12-141-15/+15
| |/ / | | | | | | | | | Change-Id: I72038f5d4568f0633d3e4ab90f4b67e2dd22c332
* | | Merge "Delete obsolete includes"Glenn Kasten2011-12-141-6/+0
|\ \ \
| * | | Delete obsolete includesGlenn Kasten2011-12-121-6/+0
| |/ / | | | | | | | | | Change-Id: I960a179a026ff8d710b43b64cb358f18ee04de16
* | | Merge "Remove redundant clear()"Glenn Kasten2011-12-141-2/+0
|\ \ \
| * | | Remove redundant clear()Glenn Kasten2011-12-141-2/+0
| |/ / | | | | | | | | | Change-Id: Ie5e4e63cbc8fa85ef50451dddf8f149fa864b132
* | | Merge "AudioTrack::setVolume check range"Glenn Kasten2011-12-141-1/+1
|\ \ \
| * | | AudioTrack::setVolume check rangeGlenn Kasten2011-12-141-1/+1
| |/ / | | | | | | | | | Change-Id: Ie182bf0f741f1f49f68c02a1e7437a2a34d34fc5
* | | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ↵James Dong2011-12-146-81/+25
|\ \ \ | | |/ | |/| | | | | | | | | | | | | to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. * commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| * | Revert the following patches because they may lead to power regression ↵James Dong2011-12-146-81/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
| * | DO NOT MERGE: Support for parsing of "folded" RTSP header valuesAndreas Huber2011-12-132-9/+31
| | | | | | | | | | | | | | | | | | | | | and some tweaks to the AMR assembler contributed by Samsung (untested). Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1 related-to-bug: 5669027
* | | am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm ↵Jeff Tinker2011-12-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | recognition fix." into ics-mr1 * commit 'dc44e06ef305be8de060af69a468e003e231ba05': Fix drm flag setting missed in false drm recognition fix.
| * | Fix drm flag setting missed in false drm recognition fix.Jeff Tinker2011-12-091-0/+1
| | | | | | | | | | | | | | | Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c related-to-bug: 5732033
* | | am 406dd5d1: am aadbd80b: Fixed the false drm recognition.James Dong2011-12-122-10/+17
|\ \ \ | |/ / | | | | | | | | | * commit '406dd5d1e48752177753666867403542e1f400ca': Fixed the false drm recognition.
| * | Fixed the false drm recognition.James Dong2011-12-082-10/+17
| | | | | | | | | | | | | | | | | | Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1 related-to-bug: 5732033
* | | Merge "Support for parsing of "folded" RTSP header values and some tweaks to ↵Andreas Huber2011-12-122-9/+31
|\ \ \ | | | | | | | | | | | | the AMR assembler"
| * | | Support for parsing of "folded" RTSP header values and some tweaks to the ↵Andreas Huber2011-12-092-9/+31
| | |/ | |/| | | | | | | | | | | | | | | | | | | AMR assembler contributed by Samsung (untested). Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
* | | Fix the build. (Change LOGV to ALOGV)Owen Lin2011-12-121-1/+1
| | | | | | | | | | | | Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
* | | am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but ↵Andreas Huber2011-12-092-4/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | queue them for 200ms" into ics-mr1 * commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d': Don't perform RTSP seeks right away but queue them for 200ms
| * | Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ↵Andreas Huber2011-12-082-4/+31
| |\ \ | | | | | | | | | | | | ics-mr1
| | * | Don't perform RTSP seeks right away but queue them for 200msAndreas Huber2011-12-082-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and only execute the last one. Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000 related-to-bug: 5732960
* | | | am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, ↵Andreas Huber2011-12-094-13/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | make sure we emulate timestamps" into ics-mr1 * commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6': Fix Bitreader "putBits" implementation, make sure we emulate timestamps
| * | | Fix Bitreader "putBits" implementation, make sure we emulate timestampsAndreas Huber2011-12-084-13/+37
| |/ / | | | | | | | | | | | | | | | | | | if we don't receive npt time mapping from the rtsp server (i.e. live stream) Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c related-to-bug: 5660357
* | | am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff ↵Jeff Tinker2011-12-095-15/+63
|\ \ \ | |/ / | | / | |/ |/| | | | | taking too long." into ics-mr1 * commit 'a5038d169f47b2e2278c0056495dfd4808803f8a': Fix ANRs due to Widevine DRM plugin sniff taking too long.
| * Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1Jeff Tinker2011-12-085-15/+63
| |\
| | * Fix ANRs due to Widevine DRM plugin sniff taking too long.Jeff Tinker2011-12-075-15/+63
| | | | | | | | | | | | | | | | | | | | | | | | Add a Widevine-specific format sniffer to avoid having to refetch data from the remote server. Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60 related-to-bug: 5725548
* | | am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 ↵Dave Burke2011-12-071-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | sniffer from blocking on data." into ics-mr1 * commit '6727a43f6d8ff193b86ca90b2daa761c47157638': Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
| * | Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.Andreas Huber2011-12-071-2/+2
| | | | | | | | | | | | | | | Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59 related-to-bug: 5666532
| * | Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching ↵James Dong2011-12-061-0/+8
| |\ \ | | | | | | | | | | | | for sync frames" into ics-mr1
| | * | DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync ↵James Dong2011-12-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frames The current logic does not check the I-frame at zeroeth position and therefore for the files with only 1 I-Frame at zeroeth postion does not play. Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com> Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch. Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94 related-to-bug: 5711942
| * | | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| |/ / | | | | | | | | | Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
* | | Allow data uris to be data sourcesNarayan Kamath2011-12-064-2/+156
| | | | | | | | | | | | | | | bug:5571010 Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
* | | resolved conflicts for merge of 07bacabe to masterAndreas Huber2011-12-052-26/+134
|\ \ \ | |/ / | | | | | | Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
| * | Properly identify how much metadata we need to cache in order to instantiateAndreas Huber2011-12-053-41/+136
| | | | | | | | | | | | | | | | | | | | | the extractor without blocking (and therefore be able to abort). Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3 related-to-bug: 5666532
| * | MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-021-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | storage DO NOT MERGE Bug: 5527220 Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO ↵Mike Lockwood2011-12-021-2/+4
| |/ | | | | | | | | | | | | | | | | | | NOT MERGE This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800 Signed-off-by: Mike Lockwood <lockwood@google.com>
generated by cgit v1.1 at 2024-05-19 00:10:33 +0000