summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove the simulator target from all makefiles. Bug: 5010576"Jeff Brown2011-07-129-77/+9
|\
| * Remove the simulator target from all makefiles.Jeff Brown2011-07-119-77/+9
| | | | | | | | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* | Merge "Audio Effect API: process reverse stream function"Eric Laurent2011-07-116-7/+51
|\ \ | |/ |/|
| * Audio Effect API: process reverse stream functionEric Laurent2011-07-116-7/+51
| | | | | | | | | | | | | | | | Added function to audio effect interface for processing of a reverse stream. This is necessary for audio pre processes like echo cancellation. Change-Id: I6e12d79dbbed6376acdfc79304b8c0ab3f705eae
* | Merge "Eliminate single-process mode. Bug: 5010576"Jeff Brown2011-07-111-4/+0
|\ \
| * | Eliminate single-process mode.Jeff Brown2011-07-081-4/+0
| | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
* | | Merge "Do not wait for unlaunched threads in stop()"James Dong2011-07-111-9/+24
|\ \ \
| * | | Do not wait for unlaunched threads in stop()James Dong2011-07-111-9/+24
| | | | | | | | | | | | | | | | Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
* | | | Merge "Release camera if CameraSource::start() has not been called"James Dong2011-07-111-2/+23
|\ \ \ \
| * | | | Release camera if CameraSource::start() has not been calledJames Dong2011-07-101-2/+23
| |/ / / | | | | | | | | | | | | Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
* | | | Merge "Remove unnecessary locking from MediaScanner JNI code"Mike Lockwood2011-07-112-7/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove unnecessary locking from MediaScanner JNI codeMike Lockwood2011-07-112-7/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is nothing in this file that requires a global lock. Furthermore, the lock can cause timeouts in native_finalize if one instance is being garbage collected while another is busy in processDirectory Bug: 5002520 Change-Id: I8717f8edeb932200d9f76b3d98915cfbe18b6ec6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file ↵Mike Lockwood2011-07-116-4/+34
|\ \ \ | | | | | | | | | | | | system"
| * | | MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file systemMike Lockwood2011-07-116-4/+34
| |/ / | | | | | | | | | | | | | | | | | | Bug: 4561836 Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | MediaScanner: Use bulk inserts when in batch modeMike Lockwood2011-07-112-27/+52
|/ / | | | | | | | | | | | | | | | | | | To do this we need to move the logic for determining media type to MediaProvider Make some things in MediaFile public so they can be used from MediaProvider Bug: 4948188 Change-Id: I6ab168b6b4d45b2fc91ea8bd52ca58283b0efc14 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Fix for issue 5007228 IllegalArgumentException when testing ↵Rajneesh Chowdury2011-07-081-4/+7
|\ \ | | | | | | | | | VideoEditorAPITest#testEffectKenBurn"
| * | Fix for issue 5007228 IllegalArgumentException when testing ↵Rajneesh Chowdury2011-07-081-4/+7
| | | | | | | | | | | | | | | | | | VideoEditorAPITest#testEffectKenBurn Change-Id: Ic8b4360cdabb157fa7739552b73e3c3daab88129
* | | Use advertised h264 encoding parameters by default if the profile is not ↵James Dong2011-07-083-7/+66
| |/ |/| | | | | | | | | | | | | baseline o Force to use AVC baseline profile for camcorder low quality videos Change-Id: I3424c57dd0c55fc4991f5767b57695c8f3420ecb
* | Moved and renamed effect API header filesEric Laurent2011-07-0711-22/+30
| | | | | | | | | | | | | | | | Moved specific effect header files to system/media/audio_effects/include/audio_effects and renamed to lower case (effect_xxx.h). Change-Id: Icfc2264bfd013cab0395d7e310ada636b9fe3621
* | Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in ↵Gloria Wang2011-07-068-11/+40
|\ \ | | | | | | | | | MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager"
| * | - Retrieve is_drm in MediaMetadataRetriever.Gloria Wang2011-07-018-11/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
* | | Associate WebP Mime-Type with FILE_TYPE_WEBP.Vikas Arora2011-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The last change for adding WEBP Mime-Type (https://android-git.corp.google.com/g/#change,112919) had this bug. Fixing the bug in this change. Change-Id: I084b66de4aabb3892fb0e6fa36062a52d4dcc224
* | | Merge "Bug 4571308 Provide correct video frame timestamps"Glenn Kasten2011-07-012-7/+7
|\ \ \
| * | | Bug 4571308 Provide correct video frame timestampsGlenn Kasten2011-06-272-7/+7
| | | | | | | | | | | | | | | | Change-Id: I0f726817fc02d3e2a4cf82ed801ef977994e6bcc
* | | | Merge "Charge network traffic to the uid of the process using the MediaPlayer."Andreas Huber2011-07-0124-22/+195
|\ \ \ \
| * | | | Charge network traffic to the uid of the process using the MediaPlayer.Andreas Huber2011-07-0124-22/+195
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067 related-to-bug: 4517282
* | | | | Merge "Ignore all flush-complete notifications with port == OMX_ALL"Andreas Huber2011-07-011-0/+12
|\ \ \ \ \
| * | | | | Ignore all flush-complete notifications with port == OMX_ALLAndreas Huber2011-07-011-0/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of this notification is not consistent across implementations. We'll drop this notification and rely on flush-complete notifications on the individual port indices instead. Change-Id: I76c0dfdcfc92a7c9acf57abf3027d2638d77efca
* | | | | Merge "Support a "secure input buffer" mode for use by Widevine DRM in ↵Andreas Huber2011-07-011-42/+146
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | OMXCodec."
| * | | | Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec.Andreas Huber2011-07-011-42/+146
| |/ / / | | | | | | | | | | | | Change-Id: Ie03b285265099dbac9b12f3f41d9ad758d0b50ad
* | | | Merge "Revert "Fix for b/4165024: Serious Memory leak when playing a WV ↵Edwin Wong2011-07-012-28/+13
|\ \ \ \ | | | | | | | | | | | | | | | protected streaming video.""
| * | | | Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected ↵Jeff Tinker2011-07-012-28/+13
| | | | | | | | | | | | | | | | | | | | | | | | | streaming video." This reverts commit d63d947d406977c7c307f69369908b4342c98ef3
* | | | | Merge "Return ERROR_END_OF_STREAM when the input source reaches eos"James Dong2011-07-012-4/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Return ERROR_END_OF_STREAM when the input source reaches eosJames Dong2011-06-292-4/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I334313b054dcf388d2e05d56efb10ceea4980638
* | | | | Merge changes I7e8401a4,I412ddf36Kristian Monsen2011-07-011-17/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Merge Chromium at r11.0.696.0: New autofill strings Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
| * | | | | Merge Chromium at r11.0.696.0: Using setter instead of direct variable accessKristian Monsen2011-06-291-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Members in UrlRequestContext was made private in upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165 Change-Id: I412ddf36b0818e59b9b3ae428407d562facd4785
* | | | | | Seeking/duration in HLS content is based on the individual segments' durationAndreas Huber2011-06-302-16/+42
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | not target-duration. Change-Id: I294097daa84c25e4084a6fc4ea80e39a543f3d10 related-to-bug: 4983285
* | | | | Merge "Revert "Parse RTP-Info even for live streams.""Andreas Huber2011-06-302-7/+2
|\ \ \ \ \
| * | | | | Revert "Parse RTP-Info even for live streams."Andreas Huber2011-06-302-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d873413ff9f742f259c29d7d0b58265db6b24529.
* | | | | | Some (most) OMX decoders do not send a OMX_CmdComplete/Flush OMX_ALL ↵Andreas Huber2011-06-301-0/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | notification Change-Id: I1bdcc7be5f12dab301891a5f9ee5cc981e09ba82
* | | | | Remove curtain effect (it's unused).Chih-Chung Chang2011-06-303-7/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2addf390aaa5aa514238b1f98eea67f27745cbf1
* | | | | Merge "Fix a format string that triggered a compile-time warning in ↵Andreas Huber2011-06-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | OMXCodec.cpp"
| * | | | | Fix a format string that triggered a compile-time warning in OMXCodec.cppAndreas Huber2011-06-291-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ib4b6cce1b4102034605da8edfb0dd8bc9a578168
* | | | | Instantiate a NetworkChangeNotifier to have chromium transparently handle ↵Andreas Huber2011-06-291-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface changes. Change-Id: If48d2934ce29d68b9c31a1d120fe8f134f277a33
* | | | Unlock the camera if media recorder fails to start recording.Wu-cheng Li2011-06-292-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | bug:4965716 Change-Id: Icb1f7f18e9ea6c4f0427ade2ed338e7d56be5e01
* | | | Support for writing output data to a provided callback function instead of a ↵Andreas Huber2011-06-281-7/+34
|/ / / | | | | | | | | | | | | | | | | | | | | | file in MPEG2TSWriter Change-Id: Ie54a5677c7b789a973aa50b7f197c6db238425bc
* | | Merge "Multiple changes to ACodec/codec tools:"Andreas Huber2011-06-281-22/+41
|\ \ \
| * | | Multiple changes to ACodec/codec tools:Andreas Huber2011-06-281-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure sf2 does not coalesce input buffers, generalize ACodec's codec instantiation based on OMXCodec's list of eligible component names. Some changes/additions to the "sf2" commandline tool Make surface options consistent with stagefright tool, i.e. use '-S' instead of '-s' New option '-R' renders surface-allocated buffers. Also fixes a longstanding bug introduced when generalizing from surfaces to native windows that never used surface-allocated buffers in sf2 even when the option was specified. Change-Id: I59fd533f0f6ef0337ebe2806ddc81a46878eb3ae
* | | | Merge "Fix for b/4165024: Serious Memory leak when playing a WV protected ↵Jeff Tinker2011-06-282-13/+28
|\ \ \ \ | |/ / / |/| / / | |/ / streaming video."
| * | Fix for b/4165024: Serious Memory leak when playing a WV protected streaming ↵Jeff Tinker2011-06-272-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | video. This change allows the WVM extractor to close and reopen when not in use which resolves the issue with heap fragmentation between plays. Change-Id: I160ee1e98aada2bfdd0818eeb6300ad50644fb75
generated by cgit v1.1 at 2025-01-11 06:21:58 +0000