summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryromJames Dong2011-09-193-10/+38
|\
| * Add QVGA resolution to CamcorderProfileJames Dong2011-09-193-10/+38
| | | | | | | | | | Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b related-to-bug: 5145483
* | Bug 5300223 RemoteControlClient uses PendingIntent for media button eventsJean-Michel Trivi2011-09-165-139/+166
|/ | | | | | | | | | | | | | | | | | | | | | Update the implementation of the RemoteControlClient / Display feature rely on PendingIntent as provided in the construction of the RemoteControlClient instance. The ComponentName that describes the target of the media button events is set as the target of the Intent from which a PendingIntent is constructed. This ComponentName is still saved in the stack for persisting the last media button event receiver. This CL also updates the lockscreen IRemoteControlDisplay implementation to use the PendingIntent supplied by the application when sending transport control events. A (good) side effect of doing this is that intent will be directly targeted at the application. Restoration of the media button event receiver after reboot is not fully functional yet. Change-Id: I2be82f2839e9dee1de02512437b3fb41cc386cde
* Fix bug 5327199 Recycle bitmaps in RemoteControlClientJean-Michel Trivi2011-09-161-0/+4
| | | | | | | | When applying the new bitmap from the editor to the client, recycle the old bitmap, and set the reference to the editor bitmap to null. Change-Id: I7d79e4b8410e5035fa51b20be4b1ada391c84c28
* If media player has died already, do not dec the old surface texture reference.Gloria Wang2011-09-151-0/+5
| | | | | | | | Otherwise segfault will occur. For bug 5327664. Do not merge. Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
* Cherry-pick from master. Do not merge.Gloria Wang2011-09-151-5/+13
| | | | | | | Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296. Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
* Merge "Change an assert failure due to unsupported level by HW AVC decoder ↵James Dong2011-09-141-9/+10
|\ | | | | | | and report the error to applications"
| * Change an assert failure due to unsupported level by HW AVC decoder and ↵James Dong2011-09-131-9/+10
| | | | | | | | | | | | | | report the error to applications Change-Id: I522a994981d86329ccc86c3b536b561dc6e40eeb related-to-bug: 5300618
* | Merge "Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed"Rajneesh Chowdury2011-09-141-2/+5
|\ \
| * | Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failedRajneesh Chowdury2011-09-141-2/+5
| | | | | | | | | | | | Change-Id: Ibd52a3bda8e1cb17f1c110cc219f2c71a46e5122
* | | Merge "Issue 5044873: Pb with BT SCO AudioManager API"Eric Laurent2011-09-141-20/+28
|\ \ \
| * | | Issue 5044873: Pb with BT SCO AudioManager APIEric Laurent2011-09-141-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not identify the SCO connection client by the binder interface passed when starting the connection as this binder changes if the AudioManager proxy changes. Use the client PID instead. This solves an issue with gTalk starting a SCO connection from one AudioManager proxy and then changing audio mode from another thus terminating the previously started SCO connection. Change-Id: Ia3067fecc551fc15df3bf75ce0c43d181859e4f0
* | | | Merge "Bug 5300223 RemoteControlClient uses PendingIntent"Jean-Michel Trivi2011-09-141-0/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Bug 5300223 RemoteControlClient uses PendingIntentJean-Michel Trivi2011-09-131-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API change so RemoteControlClient is given a PendingIntent in its constructor, which will be used for receiving media button events from remote controls. Leave the old constructors (but hidden) to not break current functionality until the AudioManager and AudioService implementations have been updated. Change-Id: Ifa12c8036c948931adc386a827dce2936788e1cd
* | | | Merge "Issue 5298399: Lost speech after a crash in gTalk."Eric Laurent2011-09-131-12/+14
|\ \ \ \
| * | | | Issue 5298399: Lost speech after a crash in gTalk.Eric Laurent2011-09-131-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed problem in AudioTrack::restoreTrack_l() causing a permanent failure if the IAudioTrack interface to AudioFlinger could not be restored at the first attempt. Change-Id: I039d4fe2dca8d3baf71f1a6c51119f27a67b6611
* | | | | API review: Metadata class not used.Dianne Hackborn2011-09-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Metadata class doesn't actually seem to be used with anything in the SDK, and the API probably needs some work, so hide it. Change-Id: Ifecf49130b90cbb4c588ad8104f1e7957978f789
* | | | | Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks"Andreas Huber2011-09-132-14/+56
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Support .avi tracks that have a sample size of 1, i.e. samples != chunksAndreas Huber2011-09-132-14/+56
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Assume for now that all chunks are the same size, i.e. have the same number of samples. Change-Id: Ib8a7dfeb16cc3e5be199ff9d98b68dd0b9c23eb8 related-to-bug: 5279872
* | | | Don't post position updates too frequentlyAndreas Huber2011-09-132-3/+17
|/ / / | | | | | | | | | | | | | | | | | | i.e. don't hog my message queue. related-to-bug: 5284760 Change-Id: I8e2d36a11dbee1567b18ed13dc5257a65c6eeda7
* | | Merge "Turn an another assertion into a runtime error in ACodec's ↵Andreas Huber2011-09-121-22/+18
|\ \ \ | | | | | | | | | | | | implementation"
| * | | Turn an another assertion into a runtime error in ACodec's implementationAndreas Huber2011-09-121-22/+18
| | |/ | |/| | | | | | | | | | Change-Id: I6779b29f200b90d088273ab3204724ef3d8d59bd related-to-bug: 5284760
* | | Increase the avi extractor's confidence slighly over mp3'sAndreas Huber2011-09-121-1/+5
|/ / | | | | | | | | | | | | | | So that we don't accidentally identify a .avi file containing an mp3 track as an mp3 file. Change-Id: I73495b80cbb5bc1007bf810f2db453c9f175171b related-to-bug: 5288189
* | MTS Recorder Test: Use VideoFrameRate from Device Camcorder ProfileDevaraj Rangasamy2011-09-091-2/+2
| | | | | | | | | | | | | | | | | | MTS tests have hardcoded video framerates. MTS can query the video framerate supported by device via Camcorder profiles and use. Change-Id: I61666df6af58eaba46f7366521cc114184cb4ac5 Signed-off-by: Devaraj Rangasamy <dev@ti.com>
* | Merge "Fix another hardcoded frame rate in the media framework test"James Dong2011-09-093-14/+25
|\ \
| * | Fix another hardcoded frame rate in the media framework testJames Dong2011-09-073-14/+25
| | | | | | | | | | | | | | | Change-Id: I7d7f9d0812a0228dbf924084a32dbede0338b421 related-to-bug: 5264298
* | | Make MediaScanner skip certain directoriesGuang Zhu2011-09-091-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list of directories to skip are configurable via setprop. The main motivation is that some test data folder takes long time to scan, and media scanner may compete for CPU time against perf tests therefore skewing the results. Bug: 5263115 Change-Id: I568213e2a4babf6033021c1d336ef0347c0e3315
* | | Merge "Don't check mFilledBuffers whether it is empty or not when the port ↵James Dong2011-09-091-3/+8
|\ \ \ | | | | | | | | | | | | reconfiguration is not meant for buffer reallocation"
| * | | Don't check mFilledBuffers whether it is empty or not when the port ↵James Dong2011-09-091-3/+8
| |/ / | | | | | | | | | | | | | | | | | | reconfiguration is not meant for buffer reallocation Change-Id: Iee9b18449bce9d7565ab5cc7f9e999484051196c related-to-bug: 5233843
* | | Merge "Fix bug 5045498 Unhide Remote Control Client API"Marco Nelissen2011-09-092-47/+80
|\ \ \
| * | | Fix bug 5045498 Unhide Remote Control Client APIJean-Michel Trivi2011-09-012-47/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RemoteControlClient API enables media application to have information such as album art, current song, playback state be displayed on "remote control displays", as well as be controlled by "remote controls". The new API consists in: - a new class, RemoteControlClient - new methods in AudioManager to register a RemoteControlClient - a new class, RemoteControlClient.MetadataEditor to edit and apply the information associated with a RemoteControlClient, and which will be displayed on a "remote control display" Change-Id: I5616085e4ad58ce0bbc1a5953b0a5a28d32f8703
* | | | Merge "Fix issue 4673378: switching from VoIP to GSM call"Eric Laurent2011-09-091-80/+108
|\ \ \ \
| * | | | Fix issue 4673378: switching from VoIP to GSM callEric Laurent2011-09-081-80/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that any app can change the audio mode and override a mode previously set by another app. If two apps (gTalk and Phone) compete for audio mode ownership, there is no mechanism to maintain coherency in the actual audio mode selected. Added a mechanism in AudioService to manage an audio mode request stack. Any app requesting a mode different from NORMAL enters at the top of the stack and the requested mode is applied. When an app sets mode back to NORMAL, it exits the stack and the new mode corresponding to the request at the top of the stack (if any) is applied. Change-Id: I68d1755d0922f680df4a19bfc5ab924f5a5d8ccd
* | | | | Fix 5278371: OOM in MediaItemThumbnailTestChih-Chung Chang2011-09-092-2/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we request 400x240 thumbnails. 100 thumbnails needs 38M, which is too much. Change it to 70 now. Also handle the case if the thumbnail callback throws exception. Change-Id: Iac4ee72f308b7c7a6ae860983197601cf89bee8f
* | | | Merge "AudioTrack: extend callback thread sleep time"Eric Laurent2011-09-081-1/+6
|\ \ \ \
| * | | | AudioTrack: extend callback thread sleep timeEric Laurent2011-09-081-1/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not force wake up the AudioTrack thread every 10ms if no timed events (loop, markers..) have to be processed. This will help reduce power consumption. Change-Id: Icb425b13800690008dd07c27ffac84739e3dbba3
* | | | Merge "Always set geometry in queuebuffer"Pannag Sanketi2011-09-081-4/+5
|\ \ \ \
| * | | | Always set geometry in queuebufferPannag Sanketi2011-09-081-4/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The queuebuffer could return early due to timestamp issues. Need to set the geometry even in that case. Change-Id: I04d7cd1df3996d640c269285398c0042923ba920
* | | | Audio player must not be used as a timesource before it's started.Andreas Huber2011-09-082-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise it'll trigger a division-by-zero exception since the audio sample rate is as yet unknown. Change-Id: I0793aa7c1c348ffa2611272bb646eff6ecf6ff53 related-to-bug: 5242451
* | | | Merge "Fix 5156702: rotate thumbnails"Chih-Chung Chang2011-09-085-120/+89
|\ \ \ \
| * | | | Fix 5156702: rotate thumbnailsChih-Chung Chang2011-09-075-120/+89
| | | | | | | | | | | | | | | | | | | | Change-Id: I97b51dadf129172d5b154e9dfd66da254e4559d7
* | | | | Merge "Bug 5270905 fix MediaPlayer with IStreamSource"Glenn Kasten2011-09-071-0/+1
|\ \ \ \ \
| * | | | | Bug 5270905 fix MediaPlayer with IStreamSourceGlenn Kasten2011-09-071-0/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: Ia8a6381a6c88b4a0a1378aab03f5275f0fa1125a
* | | | | Merge "Fixing bug in SurfaceMediaSource_test"Pannag Sanketi2011-09-071-5/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixing bug in SurfaceMediaSource_testPannag Sanketi2011-09-021-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was making EGL calls once disconnected. Instead of calling "disconnect" directly on the Surface, and EGL calls should be made to that effect. Change-Id: I21468ac8cbc2cb3145a49269e32a884736cd452e
* | | | | Apparently keyframe status in audio tracks of .webm/.mkv files is unreliableAndreas Huber2011-09-071-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fortunately in all our supported audio encodings we can treat every frame as a keyframe. Change-Id: I32f21d0077bbae7ef9efe725dd351baf531179e2 related-to-bug: 5263837
* | | | | Merge "Stop metadata retriever from dereferencing a NULL pointer if"Andreas Huber2011-09-071-2/+14
|\ \ \ \ \
| * | | | | Stop metadata retriever from dereferencing a NULL pointer ifAndreas Huber2011-09-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the media extractor failed to initialize (malformed or unsupported content) Change-Id: Icfad4e9eeb8d6713ad12eee7979ab30b696c06e0 related-to-bug: 5263840
* | | | | | Merge "Fix startBluetoothSco race"Marco Nelissen2011-09-071-4/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix startBluetoothSco raceMarco Nelissen2011-09-061-4/+2
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I8b711bd3c6b12f2e3e92144c0dadac72261bf914