summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove Ringtone.setWakeMode, it's not needed."Marco Nelissen2011-09-301-15/+0
|\
| * Remove Ringtone.setWakeMode, it's not needed.Marco Nelissen2011-09-291-15/+0
| | | | | | | | | | | | | | | | This partially reverts commit e47e8520fa48bd014287eda94ea39927de73d6bc. (the other part of that change was already removed as part of a different change) Change-Id: Ica7c196ab1f74f96237e64d07580832f0d50022f
* | Merge "Gracefuly return on detecting wrong AAC format from corrupted files"Andreas Huber2011-09-301-6/+22
|\ \
| * | Gracefuly return on detecting wrong AAC format from corrupted filesGilles-Arnaud Bleu-Laine2011-09-301-6/+22
| |/ | | | | | | | | | | | | | | | | | | | | Return BAD_VALUE error upon detection of wrongly formatted files. The client should abort the initialization upon error detection. The current CHECK() interrupts the configurecodec() preventing a graceful exit. Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100 Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
* | Wait for some time before stopping the media recorder.Gloria Wang2011-09-301-0/+12
|/ | | | | | Fix for bug 5239001. Change-Id: Ifa18a404e8568cced88a93b8d1a7125875aadb15
* Merge "Release MediaPlayer before letting it go out of scope."Marco Nelissen2011-09-291-0/+3
|\
| * Release MediaPlayer before letting it go out of scope.Marco Nelissen2011-09-291-0/+3
| | | | | | | | Change-Id: Ib2b727146f6cba91b131e66d218251f5a3206fac
* | Merge "Fix bug 5357295 NPE on display when remote control client dies"Jean-Michel Trivi2011-09-291-10/+18
|\ \
| * | Fix bug 5357295 NPE on display when remote control client diesJean-Michel Trivi2011-09-281-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a IRemoteControlClient dies, that client is set to null in the stack of remote control entries (mRCStack). This is done by calling registerRemoteControlClient() with a null client. The bug is that registerRemoteControlClient(), after storing the new client, uses it to let it know what the current remote control display is. When that display is non null, the client is sent the current display. So when a client died when there was a display, the client reference was accessed in the part of the method where we haven't yet checked whether it is null or not. The fix consists in moving the setting of the display on the client (method plugRemoteControlDisplay) only after having checked that the client is non-null. Change-Id: Ic74d6cba9e3a3a16e78cd80a1ae5901abfeb3905
* | | Merge "Support multiple NAL fragments per .mkv payload"Andreas Huber2011-09-281-47/+61
|\ \ \
| * | | Support multiple NAL fragments per .mkv payloadAndreas Huber2011-09-281-47/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the payload for an h.264 track in an .mkv file can contain multiple NAL fragments, we used to discard everything after the first one before, now we preserve them all. Change-Id: Ic7187365309f3880a3256982879a45df50db697d related-to-bug: 5337218
* | | | Merge "Flush resets the count of played audio frames"James Dong2011-09-281-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Flush resets the count of played audio framesJames Dong2011-09-271-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I0cda94646a71757fa113a199d29235e13efd7ac3 related-to-bug: 5331470
* | | | Merge "Support AMR, G.711 and vorbis audio in ACodec and friends."Andreas Huber2011-09-282-3/+95
|\ \ \ \
| * | | | Support AMR, G.711 and vorbis audio in ACodec and friends.Andreas Huber2011-09-282-3/+95
| |/ / / | | | | | | | | | | | | Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
* | | | am b2d17234: Merge "Reorganize media framework functional tests. Group tests ↵Xia Wang2011-09-2818-50/+46
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | into sub-packages" into ics-factoryrom * commit 'b2d17234b77cda555905e0da997f543708374246': Reorganize media framework functional tests. Group tests into sub-packages
| * | | Reorganize media framework functional tests.Xia Wang2011-09-2718-50/+46
| | | | | | | | | | | | | | | | | | | | | | | | Group tests into sub-packages Change-Id: I878e14487142de495fc646037d5d0b51e39341bd
* | | | Merge "Log a warning when a MediaPlayer is finalized without having being ↵Marco Nelissen2011-09-281-0/+4
|\ \ \ \ | |_|/ / |/| | | | | | | released. b/5382634"
| * | | Log a warning when a MediaPlayer is finalized without having being released.Marco Nelissen2011-09-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | b/5382634 Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
* | | | Cut down on AwesomePlayer and OMXCodec's verbosity.Andreas Huber2011-09-272-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924 related-to-bug: 5382014
* | | | Merge "Signal an appropriate error even if there are no active streams yet."Andreas Huber2011-09-276-27/+32
|\ \ \ \ | |_|_|/ |/| | |
| * | | Signal an appropriate error even if there are no active streams yet.Andreas Huber2011-09-276-27/+32
| |/ / | | | | | | | | | | | | Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49 related-to-bug: 5372901
* | | Merge "Fix issue 5373048: AudioCache decode errors"Eric Laurent2011-09-271-2/+11
|\ \ \ | |/ / |/| |
| * | Fix issue 5373048: AudioCache decode errorsEric Laurent2011-09-271-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | When decoding a file for the SoundPool, do not reject the entire file in case of error but return what was decoded so far instead. Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
* | | 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
generated by cgit v1.1 at 2025-02-10 11:07:12 +0000