summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* stagefright aacenc: Avoid warnings about incompatible pointer typesMartin Storsjo2012-01-302-2/+2
| | | | Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
* 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
* | 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
* | 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
* | 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
* | Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-191-1/+1
| | | | | | | | Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-1988-579/+579
| | | | | | | | Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1949-177/+177
| | | | | | | | Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
* | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1942-143/+143
| | | | | | | | Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1912-42/+42
| | | | | | | | Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-19105-1867/+1867
|/ | | | Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
* 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
* 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 "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-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>
* Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
| | | | | Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab related-to-bug: 5696324
* Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1Jamie Gennis2011-11-291-1/+1
|\
| * SurfaceMediaSource: use the vid enc usage bitJamie Gennis2011-11-211-1/+1
| | | | | | | | | | | | | | This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when allocating its GraphicBuffers rather than the HW_TEXTURE bit. Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
* | Merge "Make sure we can properly shutdown even if" into ics-mr1Andreas Huber2011-11-292-2/+20
|\ \
| * | Make sure we can properly shutdown even ifAndreas Huber2011-11-282-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) one of the two decoders has a pending discontinuity b) the renderer holds on to all output buffers for that decoder c) the renderer is paused if all three conditions are met the decoder won't ask for more input data and therefore never see the discontinuity. To avoid this we briefly resume the renderer just before shutting down. Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a related-to-bug: 5655016
* | | Merge "If an error occurs that prevents us from reallocating buffers during ↵Andreas Huber2011-11-291-0/+32
|\ \ \ | | | | | | | | | | | | a format change" into ics-mr1
| * | | If an error occurs that prevents us from reallocating buffers during a ↵Andreas Huber2011-11-281-0/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | format change we need to transition to executing state anyway to be able to properly flush/shutdown in the future. Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f related-to-bug: 5655016
* | | Merge "Updated (internal) API for IStreamSource to signal discontinuities" ↵Andreas Huber2011-11-292-7/+12
|\ \ \ | | | | | | | | | | | | into ics-mr1
| * | | Updated (internal) API for IStreamSource to signal discontinuitiesAndreas Huber2011-11-292-7/+12
| |/ / | | | | | | | | | | | | Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96 related-to-bug: 5553055
* | | Finer granularity discontinuity support.Andreas Huber2011-11-287-60/+151
|/ / | | | | | | | | | | | | | | No clients can signal a format change on either audio or video track (or both) and a time discontinuity (timestamps changed) independantly. Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f related-to-bug: 5553055
* | Merge "Report a runtime error instead of asserting on malformed avc ↵Andreas Huber2011-11-221-57/+87
|\ \ | | | | | | | | | configuration data." into ics-mr1
| * | Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-181-57/+87
| | | | | | | | | | | | | | | Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845 related-to-bug: 5641069
* | | Fix log spamming during time lapse video recordingJames Dong2011-11-212-10/+15
| |/ |/| | | | | | | | | Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f related-to-bug: 5626569
* | am d4b22ab4: status_t != boolMarco Nelissen2011-11-182-3/+3
|\ \ | |/ |/| | | | | * commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98': status_t != bool
| * status_t != boolMarco Nelissen2011-11-182-3/+3
| | | | | | | | | | | | b/5567433 Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
* | Make sure not to cancel pending seek/EOS notifications on a cache underrun...Andreas Huber2011-11-162-8/+9
| | | | | | | | | | | | | | or they are lost for good. Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62 related-to-bug: 5544907
* | Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames ↵Hong Teng2011-11-151-3/+7
|\ \ | | | | | | | | | in media_profiles.xml to limit the total memory usage." into ics-mr1
generated by cgit v1.1 at 2024-07-08 13:57:30 +0000