summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Propagate error signalled by the source all the way to the output EOS ↵Andreas Huber2011-09-263-6/+37
| | | | | | | notification. Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7 related-to-bug: 5372901
* Merge "Support even more .avi files with .mp3 content not aligned to chunk ↵Andreas Huber2011-09-262-38/+309
|\ | | | | | | boundaries"
| * Support even more .avi files with .mp3 content not aligned to chunk boundariesAndreas Huber2011-09-232-38/+309
| | | | | | | | | | Change-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d related-to-bug: 5349382
* | Merge "Fix issue 5355047: Automated effect tests fail."Eric Laurent2011-09-236-46/+77
|\ \
| * | Fix issue 5355047: Automated effect tests fail.Eric Laurent2011-09-236-46/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed several regressions in automated audio effect tests due to changes in effect framework and visualizer FFT output range. - Do not suspend Volume effect on session 0 when effects are enabled on specific sessions. - Adapt energy detection thresholds to new visualizer FFT range. - Leave more time for BassBoost and Virtualizer effects to ramp up before measuring the effect. - Removed second insert reverb left by mistake on the player session in preset reverb test. Change-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f
* | | am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ↵Pannag Sanketi2011-09-231-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | ics-factoryrom * commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9': Returning EOS in SurfaceMediaSource:read
| * | Returning EOS in SurfaceMediaSource:readPannag Sanketi2011-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SurfaceMediaSource::read, if disconnect has already been called, then ERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it sometimes leads to a crash in mediarecorder stop() call. Related to FactoryROM bug: 5332812 Change-Id: I22132538ab2501d084e0283876817b1ec3f64a1d
* | | Merge "Keyguard sound needs to hold wake lock."Dianne Hackborn2011-09-211-1/+16
|\ \ \
| * | | Keyguard sound needs to hold wake lock.Dianne Hackborn2011-09-211-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to hold a wakelock while playing the keyguard lock sound, so that it actually completes before the CPU goes to sleep. Change-Id: I144c345383afeb911ea461b2eb17b31183b6d092
* | | | Merge "Support some .avi files containing H.264 video, log warnings if ↵Andreas Huber2011-09-213-12/+94
|\ \ \ \ | |/ / / |/| | | | | | | audio/video unsupported"
| * | | Support some .avi files containing H.264 video, log warnings if audio/video ↵Andreas Huber2011-09-213-12/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | unsupported Change-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677 related-to-bug: 5349382
* | | | Merge "Bug 5234242 audio continues after discontinuity"Glenn Kasten2011-09-211-2/+2
|\ \ \ \
| * | | | Bug 5234242 audio continues after discontinuityGlenn Kasten2011-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce to 8 buffers of 10 packets from 16 buffers of 20 packets. Change-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83
* | | | | am 9c43016b: Merge "Bug 5045498 Keep track of RemoteControlClient play state ↵Jean-Michel Trivi2011-09-212-7/+18
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | change time" into ics-factoryrom * commit '9c43016b52afa855156aac2dc81a2bbe1e4ab436': Bug 5045498 Keep track of RemoteControlClient play state change time
| * | | Bug 5045498 Keep track of RemoteControlClient play state change timeJean-Michel Trivi2011-09-202-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the time at which a RemoteControlClient changes it playback state, and send that time to the IRemoteControlDisplay. This change will enable displays to implement strategies such as timeouts (e.g. to not display transport controls for clients which have been paused or stopped for a certain amount of time). Change-Id: I902882500565743d455d56f6000efaf612cbe0a9
* | | | Merge "MediaScanner: To query row ids of music files when handling playlists."Marco Nelissen2011-09-211-7/+22
|\ \ \ \
| * | | | MediaScanner: To query row ids of music files when handling playlists.Dongwon Kang2011-09-081-7/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: I3c2a803618bfdaf4915f2487669952d5e3b4dd32
* | | | | Merge "Fix 5224359: Add width and height to media store."Chih-Chung Chang2011-09-201-0/+25
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix 5224359: Add width and height to media store.Chih-Chung Chang2011-09-201-0/+25
| | |_|/ | |/| | | | | | | | | | Change-Id: I27376285a551e648eb0ea010dfdf6b8ed873cdd8
* | | | am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryromJames Dong2011-09-193-10/+38
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| * commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0': Add QVGA resolution to CamcorderProfile
| * | 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
* | | | Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in ↵Andreas Huber2011-09-192-23/+84
|\ \ \ \ | | | | | | | | | | | | | | | long streams"
| * | | | Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long ↵Andreas Huber2011-09-192-23/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streams containing B-frames. Change-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642 related-to-bug: 5336497
* | | | | am 2f153169: Merge "Bug 5300223 RemoteControlClient uses PendingIntent for ↵Jean-Michel Trivi2011-09-195-139/+166
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | media button events" into ics-factoryrom * commit '2f153169594249738d63aa6e2897d257f6b7d71e': Bug 5300223 RemoteControlClient uses PendingIntent for media button events
| * | | 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
* | | Merge "In order to recover from video lagging behind audio, drop avc frames"Andreas Huber2011-09-198-44/+155
|\ \ \
| * | | In order to recover from video lagging behind audio, drop avc framesAndreas Huber2011-09-168-44/+155
| | | | | | | | | | | | | | | | | | | | | | | | that are not referenced by other frames before feeding them into the decoder. Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
* | | | am f79ec360: Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" ↵Jean-Michel Trivi2011-09-161-0/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | into ics-factoryrom * commit 'f79ec360984011c49c52b7a19b96cbbc932df4be': Fix bug 5327199 Recycle bitmaps in RemoteControlClient
| * | 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
* | | Various improvements to nuplayer playbackAndreas Huber2011-09-1612-63/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Drastically cut down the number of times we supply the AudioSink with data by estimating the time until the sink would run out of data and then scheduling a refill in advance of that. - Use a dedicated looper for video decoders since they are currently taking too long to return from OMX_FillThisBuffer (bug 5325201) - Revise thread priorities for the OMX dispatcher and software codecs, instead of running them at ANDROID_PRIORITY_AUDIO, they now only run at ANDROID_PRIORITY_FOREGROUND - Since threads created by pthread_create inherit all of the parent threads attributes including thread priority, briefly reset thread priority to ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then restore it. Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
* | | Merge "If media player has died already, do not dec the old surface texture ↵Gloria Wang2011-09-151-0/+5
|\ \ \ | | | | | | | | | | | | reference. Otherwise segfault will occur. For bug 5327664."
| * | | 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. Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
* | | | Merge "Do not need to reset surface as NULL in MediaPlayer's _release. ↵Gloria Wang2011-09-151-5/+13
|\ \ \ \ | |/ / / | | / / | |/ / |/| | Related to bug 5252296."
| * | Do not need to reset surface as NULL in MediaPlayer's _release.Gloria Wang2011-09-141-5/+13
| | | | | | | | | | | | | | | | | | 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