summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes ↵James Dong2011-03-021-2/+4
|\ | | | | | | as in unit of bits"
| * PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in ↵James Dong2011-03-021-2/+4
| | | | | | | | | | | | | | | | unit of bits bug - 3464899 Change-Id: Idef81a1bd3846d60fc5e4a40c11ce1ba78ebaa23
* | Merge "Provide better duration and seek accuracy if playing vorbis audio ↵Andreas Huber2011-03-021-16/+125
|\ \ | | | | | | | | | from a non-streaming source."
| * | Provide better duration and seek accuracy if playing vorbis audio from a ↵Andreas Huber2011-03-021-16/+125
| |/ | | | | | | | | | | | | non-streaming source. Change-Id: Ib823c2dd28e84f4c49e3676f4e4962a6e006b166 related-to-bug: 3107013
* | Merge "Fix for issue 3371667: fix source code compilation warnings (4)"Basavapatna Dattaguru2011-03-022-26/+26
|\ \
| * | Fix for issue 3371667: fix source code compilation warnings (4)Basavapatna Dattaguru2011-03-022-26/+26
| |/ | | | | | | Change-Id: I898f81fea6c061b9ca7cbd675218d9f4b8c0bc77
* | Merge "Fix for issue 3495914: (In Java) Video clip switches between start ↵Santosh Madhava2011-03-021-2/+2
|\ \ | |/ |/| | | and end"
| * Fix for issue 3495914: (In Java) Video clip switches between start and endSantosh Madhava2011-03-011-2/+2
| | | | | | | | Change-Id: Ie5ea83c61c6c008162abea76e15d745a901a1e23
* | Merge "Get rid of redundant media profiles"James Dong2011-03-011-6/+172
|\ \
| * | Get rid of redundant media profilesJames Dong2011-03-011-6/+172
| | | | | | | | | | | | | | | | | | bug - 3330679 Change-Id: Idc55aea32746c0c57552c5e15a289681421aa859
* | | Fix issue 3499926.Eric Laurent2011-03-011-8/+14
|/ / | | | | | | | | | | | | | | | | Make sure that NumberEffectsEnabled is decremented at the same time as SamplesToExitCountBb reaches 0 in Effect_process(). Not doing so causes NumberEffectsEnabled not being decremented if Effect_setEnabled() is called after SamplesToExitCountBb reaches 0 and before next Effect_process() is called. Change-Id: Id827a301f93a5a09ecd9995a0c7d731ef526711a
* | Merge "Fix for issue 3431967: Memory leak from video editor engine"Santosh Madhava2011-03-011-21/+26
|\ \
| * | Fix for issue 3431967: Memory leak from video editor engineSantosh Madhava2011-03-011-21/+26
| |/ | | | | | | Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
* | Merge "Move USB framework support from android.hardware to ↵Mike Lockwood2011-03-014-14/+14
|\ \ | | | | | | | | | android.hardware.usb package"
| * | Move USB framework support from android.hardware to android.hardware.usb packageMike Lockwood2011-03-014-14/+14
| |/ | | | | | | | | Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Stagefright: Query buffer usage from the component."Jamie Gennis2011-03-012-4/+18
|\ \
| * | Stagefright: Query buffer usage from the component.Jamie Gennis2011-02-282-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | This change makes Stagefright query the gralloc buffer usage flags from the OMX IL component and passing those flags on to the ANativeWindow. Change-Id: Ic9af8a9e6df9ff4aadc7355890324d68841bc488 Related-Bug: 3479027
* | | Merge "Add an OMX IL API for querying buffer usage flags."Jamie Gennis2011-03-015-0/+79
|\ \ \ | |/ /
| * | Add an OMX IL API for querying buffer usage flags.Jamie Gennis2011-02-285-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change defines an OpenMAX IL API for querying from the IL component the gralloc buffer usage flags that should be used to allocate the buffers. It also adds the Stagefright plumbing for using the new OMX IL API. Change-Id: I046b5e7be70ce61e2a921dcdc6e3aa9324d19ea6 Related-Bug: 3479027
* | | Merge "Fix error recovery in Stagefright init."Jamie Gennis2011-03-012-32/+27
|\ \ \ | |_|/ |/| |
| * | Fix error recovery in Stagefright init.Jamie Gennis2011-02-282-32/+27
| | | | | | | | | | | | | | | | | | | | | | | | This change fixes the error path of OMXCodec::allocateOutputBuffersFromNativeWindow so that it cancels the correct number of buffers if a dequeueBuffer operation fails. Change-Id: Ib7cdcdf24f1718bc070ad218a5980949c0e942eb
* | | Merge "CameraBrowser: Add USB device filter meta-data for digital cameras"Mike Lockwood2011-02-283-59/+24
|\ \ \
| * | | CameraBrowser: Add USB device filter meta-data for digital camerasMike Lockwood2011-02-283-59/+24
| |/ / | | | | | | | | | | | | | | | | | | This is used by the USB service to associate Gallery with PTP cameras. Removed unnecessary broadcast receiver Change-Id: Ifd78aa94f69cb7d6ec0b557313e90bb79812f15d
* | | Merge "Remove the hard coded media recorder test cases. Add the native heap ↵Yu Shan Emily Lau2011-02-284-177/+88
|\ \ \ | | | | | | | | | | | | dump catpure functionality."
| * | | Remove the hard coded media recorder test cases.Yu Shan Emily Lau2011-02-254-177/+88
| | | | | | | | | | | | | | | | | | | | | | | | Add the native heap dump catpure functionality. Change-Id: I434ff886152cbb9b2b9a4e39c75bfd016e0e50a0
* | | | Merge "The color conversion from YUV420Planar to RGB only requires the image ↵James Dong2011-02-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | width to be a multiple of 2, not 4."
| * | | | The color conversion from YUV420Planar to RGB only requires the image width ↵James Dong2011-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be a multiple of 2, not 4. bug - 3379293 Change-Id: I8960737f0604b54ce90dfc26137f1582073b4ab2
* | | | | Merge "Fix for issue 3466385: Low quality video properties are applied to all"Santosh Madhava2011-02-283-2/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix for issue 3466385: Low quality video properties are applied to allSantosh Madhava2011-02-273-2/+8
| | |_|/ | |/| | | | | | | | | | Change-Id: Idcae85d88de65bae549263f9c43a6f3020dd63a1
* | | | Merge "Fix issue 3388354."Eric Laurent2011-02-281-9/+23
|\ \ \ \
| * | | | Fix issue 3388354.Eric Laurent2011-02-281-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release all sco audio clients when the intent indicating STATE_AUDIO_DISCONNECTED state is received. Also clear mScoClients array when clients are released. Change-Id: I63ec9d70fe72a102e09a4a473a367fb2e550b171
* | | | | Merge "Instrumentation code to enable/disable memory leak check using setprop"Rajneesh Chowdury2011-02-281-0/+51
|\ \ \ \ \
| * | | | | Instrumentation code to enable/disable memory leak check using setpropRajneesh Chowdury2011-02-271-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The heap memory dump is enabled when libc.debug.malloc property is 1. Two .dump files are created in predefined path. Memory leak report can be generated using nativeheapdump tool. Change-Id: Ie03928b5a05993e72d4700a158657c514478ecd3
* | | | | | Merge "Fix for issue 3431967: Memory leak from video editor engine"Santosh Madhava2011-02-281-5/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix for issue 3431967: Memory leak from video editor engineSantosh Madhava2011-02-271-5/+12
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I610e82f5bdb8ac7b32541301a9fa41bbd8f1459d
* | | | | Bug 3447027 Limit previews for DRM videoGlenn Kasten2011-02-283-11/+25
|/ / / / | | | | | | | | | | | | Change-Id: I5b15cf6a15623cf73f007c59143ab5e3fa5a07e8
* | | | mp4a box contains mp3 audio when the object type indication is 0x6bJames Dong2011-02-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case, the MediaExtractor returns ERROR_UNSUPPORTED since our software MP3 audio decoder may not be able to handle packetized MP3 audio. bug - 3377570 Change-Id: I8bb6b3813716b5fa019e318842e8e1908b3c8bf8
* | | | Merge "VideoEditor: Issue:3396697: Update Perf and Stress test code"Basavapatna Dattaguru2011-02-242-27/+27
|\ \ \ \ | |/ / / |/| | |
| * | | VideoEditor: Issue:3396697: Update Perf and Stress test codeBasavapatna Dattaguru2011-02-242-27/+27
| | | | | | | | | | | | | | | | Change-Id: Ifd90e8e1fdff1a04d47a3ae65813584cab78255c
* | | | Merge "Alternate patch for late video issue: seek only the video ahead to ↵Andreas Huber2011-02-242-17/+66
|\ \ \ \ | | | | | | | | | | | | | | | the next"
| * | | | Alternate patch for late video issue: seek only the video ahead to the nextAndreas Huber2011-02-242-17/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syncframe after the current audio media position, leave audio untouched. Change-Id: Ia9fa8e205467e5460c8219afd396bddd09fcfb46 related-to-bug: 3375737
* | | | | Merge "Fix for issue 3485010: The project thumbnail is not regenerated"Santosh Madhava2011-02-241-0/+11
|\ \ \ \ \
| * | | | | Fix for issue 3485010: The project thumbnail is not regeneratedSantosh Madhava2011-02-241-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c882bdf2e82b95b1ad19ab50ec636a78b1c1561
* | | | | | Merge "Suppress the logging of URLs when in incognito mode."Andreas Huber2011-02-2410-15/+77
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Suppress the logging of URLs when in incognito mode.Andreas Huber2011-02-2410-15/+77
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a related-to-bug: 3336575
* | | | | Merge "UsbManager: Remove redundant Intent extras from USB device and ↵Mike Lockwood2011-02-242-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | accessory broadcasts"
| * | | | | UsbManager: Remove redundant Intent extras from USB device and accessory ↵Mike Lockwood2011-02-232-4/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | broadcasts These extras are also accessable via the UsbDevice and UsbAccessory classes, which are also included as extras. Since you can't filter Intents based on extras there is no point in duplicating this information as separate extras. Change-Id: I4c8d1e70d66023a1800b3f8f06118898da6b37af Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"Glenn Kasten2011-02-2425-61/+260
|\ \ \ \ \
| * | | | | Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-2325-61/+260
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the use of a SurfaceTexture in place of a Surface as the video sink for an android.media.MediaPlayer. The new API MediaPlayer.setTexture is currently hidden. This includes: - New Java and C++ interfaces - C++ plumbing and implementation (JNI, Binder) - Stagefright AwesomePlayer and NuPlayer use ANativeWindow (either Surface or SurfaceTextureClient) Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
* | | | | Fix MP3ExtractorJames Dong2011-02-241-5/+13
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the temp buffer wraps around, the next read position should start from what have been read to avoid reading the same remaining bytes in the buffer again. o also fix some of the formatting string for logging bug - 3482444 Change-Id: Ie0b56f4691ff9e80a48a57f1b7d0d28c78cfb313