summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 52bfc243: docs: fix misc doc bugs from external issue trackerScott Main2012-02-091-3/+3
|\ | | | | | | | | * commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6': docs: fix misc doc bugs from external issue tracker
| * docs: fix misc doc bugs from external issue trackerScott Main2012-02-091-3/+3
| | | | | | | | Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
* | am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit ↵Jean-Baptiste Queru2012-01-251-3/+3
|\ \ | | | | | | | | | | | | | | | | | | platforms" * commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3': stagefright aacenc: Fix type definitions for 64 bit platforms
| * \ Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"Jean-Baptiste Queru2012-01-251-3/+3
| |\ \
| | * | stagefright aacenc: Fix type definitions for 64 bit platformsMartin Storsjo2012-01-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also don't require LINUX to be defined, enable the MSVC typedefs only within _MSC_VER. This fixes a lot of warnings about dereferencing pointer 'winPtr' breaking strict aliasing rules. Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
* | | | am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function ↵Jean-Baptiste Queru2012-01-241-2/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 64-bit safe" * commit '98539a4eba7677c0b1ddc12f800c7075851ef302': stagefright amrwbenc: Make the mem_malloc function 64-bit safe
| * | | Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"Jean-Baptiste Queru2012-01-241-2/+7
| |\ \ \
| | * | | stagefright amrwbenc: Make the mem_malloc function 64-bit safeMartin Storsjo2012-01-131-2/+7
| | |/ / | | | | | | | | | | | | Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
* | | | am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of ↵Jean-Baptiste Queru2012-01-2413-13/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | files" * commit 'd80cbb8c7b13203704c00e2f5941588811c15665': stagefright aacenc: Add missing newlines at the end of files
| * | | Merge "stagefright aacenc: Add missing newlines at the end of files"Jean-Baptiste Queru2012-01-2413-13/+13
| |\ \ \
| | * | | stagefright aacenc: Add missing newlines at the end of filesMartin Storsjo2012-01-1313-13/+13
| | |/ / | | | | | | | | | | | | | | | | | | | | This avoids compiler warnings about missing newlines. Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
* | | | am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '164a984224f5d430757628028f2522329987350f': stagefright aacenc: Properly terminate a comment
| * | | Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
| |\ \ \
| | * | | stagefright aacenc: Properly terminate a commentMartin Storsjo2012-01-131-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | This avoids a warning about /* within a comment. Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
* | | | am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"Jean-Baptiste Queru2012-01-191-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9d25b82d280c2d979d500e7da4447148f32f820b': Rename LOG_ASSERT to ALOG_ASSERT
| * | | Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-191-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
* | | | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-19102-754/+754
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6df477be186233e36fc370c4d2db6c1ed928a740': Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
| * | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-19102-754/+754
| | | | | | | | | | | | | | | | Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
* | | | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-1954-187/+187
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f': Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
| * | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1954-187/+187
| | | | | | | | | | | | | | | | Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
* | | | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"Jean-Baptiste Queru2012-01-1945-146/+146
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4f367f3387887c538c81c34cc8becaea6fa5e430': Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
| * | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1945-146/+146
| | | | | | | | | | | | | | | | Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
* | | | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"Jean-Baptiste Queru2012-01-1915-48/+48
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ba7f0d2a03643ce429421b81febf18fd50473070': Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
| * | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1915-48/+48
| | | | | | | | | | | | | | | | Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
* | | | Merge ee4618bcJean-Baptiste Queru2012-01-19117-2100/+2100
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
| * | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-19117-2100/+2100
| |/ / | | | | | | | | | Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
* | | am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove ↵Jean-Baptiste Queru2012-01-13133-5071/+5071
|\ \ \ | |/ / | | / | |/ |/| | | | | trailing whitespace" * commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d': stagefright aacenc/amrwbenc: Remove trailing whitespace
| * stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-12133-5071/+5071
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was applied in AOSP master earlier, in commit b21611e5b0f1797e39e781d91ade023bac87637f, but when merged into the Google internal tree in 88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these changes have been brought in. (The diff of this merge commit and its first parent, d94b71d, is empty.) Therefore, reapply the rest of these changes on the files that still are present in the current version. Change-Id: I645a9b9134769958a11808a06163123d28d83e46
* | stagefright: limit audio gap for looped playbackEric Laurent2012-01-091-0/+4
|/ | | | | | | | | | | | | | | | | The audio gap when looping audio is mostly due to a delay requested by the audio player when executing the end of stream message. This is to allow the audio to be drained out of the pipe before actually stopping the AudioTrack. This delay is not needed when looping as the AudioTrack is not stopped. The fix consists in ignoring the requested delay when the looping flag is set in awesome player. Issue 5800981. Change-Id: Ib32d2930c53ecebc21ca8440e6e054c7e20db4a5
* 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
* 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
* Fix drm flag setting missed in false drm recognition fix.Jeff Tinker2011-12-091-0/+1
| | | | | Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c related-to-bug: 5732033
* Fixed the false drm recognition.James Dong2011-12-082-10/+17
| | | | | | Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1 related-to-bug: 5732033
* 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
* | 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
* 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
* | 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 "Fix for issue 5712743 video editor functional test : ↵Hong Teng2011-12-061-1/+1
|\ \ | | | | | | | | | testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1
| * | Fix for issue 5712743 video editor functional test : testPreviewDuringExport ↵Hong Teng2011-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime. Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
* | | Merge "New and improved silent mode on lockscreen." into ics-mr1Amith Yamasani2011-12-061-2/+8
|\ \ \
| * | | New and improved silent mode on lockscreen.Amith Yamasani2011-12-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu. No volume dialog on lockscreen, unless Power menu is up. Set VIBRATE_IN_SILENT=1 when upgrading device. Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
* | | | 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
* | | 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-022-42/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2025-01-27 13:33:59 +0000