summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Add the default camera id to mCameraIds for emulator and those devices ↵James Dong2011-03-161-0/+5
| | | | | | | | without media_profiles.xml configuration file. bug - 4109530 Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
* DO NOT MERGE: Fix a race condition when playing an audio-only stream and ↵Andreas Huber2011-03-161-12/+5
| | | | | | | seeking before starting. Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7 related-to-bug: 4039068
* MtpDevice: Handle zero length packets in readResponse()Mike Lockwood2011-03-141-0/+4
| | | | | | | Bug: 3509060 Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP host: Fix problems reading large data packetsMike Lockwood2011-03-121-3/+3
| | | | | | | | | Fixes problem reading large thumbnails via PTP Bug: 4065217 Change-Id: I643672512829c93ab0827091f39103dbb1918071 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Bug 3012968 DRM output controlGlenn Kasten2011-03-102-0/+24
| | | | | | | Modifies Stagefright to verify that there is a hardware-protected path to video sink for DRM content. Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
* Fix issue 3439872: video chat and bluetooth SCOEric Laurent2011-03-082-80/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the stability problems experienced when using a bluetooth headset supporting both A2DP and SCO. Problems occur when starting the video chat at which time the A2DP output is being stopped to start SCO. At that time, active AudioTracks are invalidated by AudioFlinger so that a new AudioTrack binder interface can be recreated by the client process on the new mixer thread with correct parameters. The problem was that the process to restore the binder interface was not protected against concurrent requests which caused 2 binder interfaces to be created sometimes. This could lead to permanent client deadlock if one of the client threads was waiting for a condition of the first created binder interface while the second one was created (as the AudioFlinger would only signal conditions on the last one created). This concurrent request situation is more likely to happen when a client uses the JAVA AudioTrack as the JNI implementation uses simultaneously the native AudioTrack callback and write push mechanisms. By doing so, the code that checks if the binder interface should be restored (in obtainBuffer()) is much more likely to be called concurrently from two different threads. The fix consists in protecting the critical binder interface restore phase with a flag in the AudioTrack control block. The first thread acting upon the binder interface restore request will raise the flag and the second thread will just wait for a condition to be signaled when the restore process is complete. Also protected all accesses to the AudioTrack control block by a mutex to prevent access while the track is being destroyed and restored. If a mutex cannot be held (e.g because we call a callback function), acquire a strong reference on the IAudioTrack to prevent its destruction while the cblk is being accessed. Modified AudioTrack JNI to use GetByteArrayElements() instead of GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem callback being called during the critical section when media server process restarts. Anyway with current JNI implementation, either versions do not copy data most of the times and the criticial version does not guaranty no data copy. The same modifications have been made to AudioRecord. Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
* Add missing copyright headers to a couple of filesJames Dong2011-03-072-0/+32
| | | | | | bug - 4025673 Change-Id: Ie1c4cf18c06032f9b89cc08e5be25d38c0f76aa1
* Fix a leak from AACEncoder.cppJames Dong2011-03-041-0/+3
| | | | | | bug - 3470617 Change-Id: I328e92bc1b2aca72e5856703dae00f957f40bc27
* Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file ↵James Dong2011-03-041-2/+2
| | | | | | | | | | | must have the same mode For some mp3 files, the mode can be changed from one audio frame to another. Without the capability to switch modes, the decoded audio may have lots of artifacts. bug - 3253310 Change-Id: Id57bb1f204642d15e38a800c72214f6794cfaa37
* Merge "- To track the usage of all audio output devices - To track the ↵Gloria Wang2011-03-022-2/+129
|\ | | | | | | currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()"
| * - To track the usage of all audio output devicesGloria Wang2011-03-022-2/+129
| | | | | | | | | | | | | | | | - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData() Change-Id: I374c755266b5ac6b1c6c630400f4daf901ea8acc
* | Merge "Stagefright: Use the ANW min undequeued bufs query."Jamie Gennis2011-03-022-28/+53
|\ \
| * | Stagefright: Use the ANW min undequeued bufs query.Jamie Gennis2011-02-282-29/+53
| | | | | | | | | | | | | | | | | | | | | | | | This change modifies Stagefright's ANativeWindow initialization to use the new MIN_UNDEQUEUED_BUFFERS query on the ANativeWindow. Change-Id: I62565945e90ac40de326de77adcfa5577ed89975 Related-Bug: 3356050
* | | Merge "Resize internal PES buffers dynamically instead of relying on a fixed ↵Andreas Huber2011-03-021-1/+12
|\ \ \ | | | | | | | | | | | | maximum size."
| * | | Resize internal PES buffers dynamically instead of relying on a fixed ↵Andreas Huber2011-03-021-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | maximum size. Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952
* | | | Merge "Allow optional specification of a PTS timestamp when signalling a ↵Andreas Huber2011-03-0211-22/+120
|\ \ \ \ | |/ / / | | | | | | | | discontinuity."
| * | | Allow optional specification of a PTS timestamp when signalling a discontinuity.Andreas Huber2011-03-0211-22/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If present, rendering will be suppressed until reaching the timestamp. Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19 related-to-bug: 3489454
* | | | 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
* | | 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 "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 "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 "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
* | | 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 "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 "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 "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"Glenn Kasten2011-02-2422-40/+151
|\ \ \
| * | | Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-2322-40/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Don't crash when parsing DRM MIME types"Glenn Kasten2011-02-241-5/+12
|\ \ \
| * | | Don't crash when parsing DRM MIME typesGlenn Kasten2011-02-181-5/+12
| | | | | | | | | | | | | | | | Change-Id: I414897c911a6588061ddbb5f05c574e78162dca9
* | | | d263 may contain optional bitr box, and thus its size can be up to 23 bytesJames Dong2011-02-231-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3482703 Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
* | | | Merge "Remove RefBase.h dependency on TextOutput.h"Mathias Agopian2011-02-236-0/+6
|\ \ \ \
| * | | | Remove RefBase.h dependency on TextOutput.hMathias Agopian2011-02-226-0/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
* | | | | Merge "To collect the total usage time of encoders in the media recorder"Gloria Wang2011-02-232-7/+81
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | To collect the total usage time of encoders in the media recorderGloria Wang2011-02-232-7/+81
| | | | | | | | | | | | | | | | | | | | Change-Id: I94c9c94dec6bd714a3ebf96b4465b94f069e55b8
* | | | | Merge "Application-managed callback buffer support for raw image"James Dong2011-02-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Application-managed callback buffer support for raw imageJames Dong2011-02-221-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | bug - 3292153 Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
* | | | Merge "- Add method in MediaPlayerService to collect and pull codec usage ↵Gloria Wang2011-02-234-2/+186
|\ \ \ \ | |/ / / |/| | | | | | | (duration) for the battery app - Collect MediaPlayer decoding usage data"
generated by cgit v1.1 at 2024-06-29 20:31:52 +0000