summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ↵Jamie Gennis2011-10-261-0/+160
|\ | | | | | | | | | | | | ics-mr0 * commit 'b7b4eaaa05284634d50d581d924a250f1194f66d': Stagefright: push blank buffers when tearing down
| * Stagefright: push blank buffers when tearing downJamie Gennis2011-10-251-0/+160
| | | | | | | | | | | | | | | | | | | | | | This change makes OMXCodec push RGB 565 buffers filled with black to an ANativeWindow when tearing down after decoding to protected gralloc buffers. This allows the OMX tear down to zero out any protected buffers that were used without the possibility that the buffer is still being used by SurfaceFlinger or HWComposer. Bug: 5483222 Change-Id: I8acedd81a7bb67dfdc2fd15733e3375b6ce8d560
* | am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-196-1/+65
|\ \ | |/ | | | | | | * commit '23d644202a44383bf008ff86f6faa3ea7e447290': Stagefright: idle OMX after ANW errors
| * Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-196-1/+65
| |\
| | * Stagefright: idle OMX after ANW errorsJamie Gennis2011-10-196-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes an issue in Stagefright where the state of an OMXCodec object can get out of sync with the state of the OMX component. In particular, if one of the ANativeWindow functions failed and put the OMXCodec into the ERROR state, this would cause Stagefright to skip doing the Executing -> Idle transition. Without this transition the freeBuffersOnPort call would never be made, and the MediaBuffers would end up being leaked (which would also leak the Gralloc buffers they reference). Bug: 5333695 Change-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34
* | | am b3cdadb6: Merge "Check whether media recorder client exists before ↵James Dong2011-10-191-5/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | dumping." into ics-mr0 * commit 'b3cdadb639027f62c7c1637ca962a70d2d1f3b4d': Check whether media recorder client exists before dumping.
| * | Check whether media recorder client exists before dumping.James Dong2011-10-181-5/+7
| | | | | | | | | | | | | | | Change-Id: I1f3a644a958975e4cf6c02099c53e30cc4d2fd82 related-to-bug: 5477177
* | | Merge "Refactor FileInserter in MediaScanner and adding unit tests for the ↵Marco Nelissen2011-10-195-55/+334
|\ \ \ | | | | | | | | | | | | newly added class."
| * | | Refactor FileInserter in MediaScanner and adding unit tests for the newly ↵Dongwon Kang2011-10-105-55/+334
| | | | | | | | | | | | | | | | | | | | | | | | added class. Change-Id: Ia0e8c95239916fd4c21cb5bf10ac94201e6eb6f1
* | | | am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to ↵James Dong2011-10-181-7/+16
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 * commit '5264f6003bbcb8ca70df034379154914260cc322': Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
| * | | Bail out after kMaxColorFormatSupported calls to OMX_GetParameter().James Dong2011-10-181-7/+16
| | |/ | |/| | | | | | | | | | | | | | | | Avoid infinite loop in querying omx component about the supported color format. Change-Id: I4997efd36462c792a6d8b5e04c79a80966a559fe related-to-bug: 5466057
* | | am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ↵Eric Laurent2011-10-171-13/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr0 * commit 'c0a87dc10cc74918518457e96b48f16bcc0ea2cd': Fix issue 5462427: Volume should never be 0 ...
| * | Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0Eric Laurent2011-10-171-13/+33
| |\ \
| | * | Fix issue 5462427: Volume should never be 0 ...Eric Laurent2011-10-141-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that ring or notification volume index never reaches 0 unless in silent mode. Conversely, enter silent mode when this volume is set to 0. Change-Id: Iff5e5e972b607f4736e7a704b26b2dadb40074b0
* | | | am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the ↵Dave Burke2011-10-171-10/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | server" into ics-mr0 * commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4': Don't hold onto the lock while reconnecting to the server
| * | | Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0Dave Burke2011-10-171-10/+18
| |\ \ \
| | * | | Don't hold onto the lock while reconnecting to the serverAndreas Huber2011-10-171-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid stalling the readers. Change-Id: I73b646587c8a654a73ff7d800c0f17bd78001855
* | | | | am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0Jamie Gennis2011-10-171-2/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c4de6f81d4533acbfc162d051de480d474b72e76': MediaPlayer: properly handle released surfaces
| * | | | MediaPlayer: properly handle released surfacesJamie Gennis2011-10-141-2/+8
| | |/ / | |/| | | | | | | | | | | | | | Bug: 5396571 Change-Id: I6af87cb04f09f9ae6ea77cd7ba31108a3e93d24a
* | | | am 615858a8: Merge "Indicate screen off condition to audio framework." into ↵Eric Laurent2011-10-141-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ics-mr0 * commit '615858a8ebb12b3541fd709e6e965ac814880261': Indicate screen off condition to audio framework.
| * | | Indicate screen off condition to audio framework.Eric Laurent2011-10-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a mechanism for AudioService to notify audio framework and audio HAL that screen is turned on or off. This indication can be used by lower audio layers to trigger low power audio playback mode. Current implementaiton based on setParameters() method is experimental and will be replaced by a different interface when ready. Change-Id: Ie72ada0a8edec3d71b47681b9f51cb5bc839d45b
* | | | am e48440d5: Merge "Fix 5153611 remove remote control client/display log ↵Jean-Michel Trivi2011-10-141-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | from AudioService" into ics-mr0 * commit 'e48440d59a52c0f13166da2fd32023356d9215d9': Fix 5153611 remove remote control client/display log from AudioService
| * | | Fix 5153611 remove remote control client/display log from AudioServiceJean-Michel Trivi2011-10-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not log debug messages for the RemoteControlClient and IRemoteControlDisplay related features. Change-Id: I81bfeec1770f81b78b679dc03fb40806393b170a
* | | | NuPlayer is now taking on the task of streaming over RTSP.Andreas Huber2011-10-1318-664/+603
| | | | | | | | | | | | | | | | Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
* | | | Merge "Support for an MPEG2 Program Stream extractor."Andreas Huber2011-10-1314-11/+873
|\ \ \ \ | |/ / / |/| | |
| * | | Support for an MPEG2 Program Stream extractor.Andreas Huber2011-09-3014-11/+873
| | | | | | | | | | | | | | | | Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
* | | | MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in sizeMike Lockwood2011-10-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5432487 Change-Id: Ie86e72d9d85476941eab6a9d271948b8fdde6926 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTSAndreas Huber2011-10-122-2/+8
| |/ / |/| | | | | | | | | | | Change-Id: I3b31f08428fb7195b98f145ae0675006c8756de1 related-to-bug: 5450187
* | | DO NOT MERGE Fix 5389442 RemoteControlClient javadocJean-Michel Trivi2011-10-111-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extend RemoteControlClient class description with an example of instance creation showing how the PendingIntent is created and how it uses the same ComponentName as the one used in AudioManager.registerMediaButtonEventReceiver() Change-Id: I1af61ddbf5cfb9160ea5b814bed7b881d51b7eff
* | | Merge "Support AMR as a file type so that it can be imported into movie studio"James Dong2011-10-103-3/+8
|\ \ \
| * | | Support AMR as a file type so that it can be imported into movie studioJames Dong2011-10-093-3/+8
| | |/ | |/| | | | | | | | | | Change-Id: I3fc4f49ae0a210f53b1bab68716f4e558b3d91c5 related-to-bug: 5419452
* | | YouTube can now request custom cache/prefetch parameters and ↵Andreas Huber2011-10-103-4/+76
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disconnect-at-highwater through the use of pseudo http headers specified in the setDataSource call. x-cache-config: -1/-1/0 x-disconnect-at-highwatermark: 1 turns off keep-alives and disconnects every time the cache is full (will attempt to reconnect once it run below lowwater mark) related-to-bug: 5433309 Change-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1
* | Specifying -1 for both low and highwater marks would not actually do the ↵Andreas Huber2011-10-071-5/+15
| | | | | | | | | | | | | | | | | | right thing before this change. Also make it more consistent in that specifying -1 for the keepalive settings specifies the default. Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
* | Merge "Allow a system property "media.stagefright.cache-params" to override ↵Andreas Huber2011-10-072-9/+65
|\ \ | | | | | | | | | cache/prefetcher"
| * | Allow a system property "media.stagefright.cache-params" to override ↵Andreas Huber2011-10-062-9/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache/prefetcher default parameters. To override specify a property adb shell setprop media.stagefright.cache-params "4096/20480/15" to set the low water threshold to 4096 KB, the high water threshold to 20 MB and the keepalive interval to 15 secs. if high and/or lowwater mark are negative, the default values are used for the respective value. if keep-alive interval is 0, keep-alives are disabled. Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
* | | Merge "Fix an issue where we should allow negative values but did not"James Dong2011-10-062-8/+8
|\ \ \
| * | | Fix an issue where we should allow negative values but did notJames Dong2011-10-052-8/+8
| |/ / | | | | | | | | | | | | Change-Id: Ia8d718b4e6aec4c17db86e30134132f767fd72c5 related-to-bug: 5419527
* | | Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 ↵Andreas Huber2011-10-061-4/+6
|/ / | | | | | | | | | | | | files. Change-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749 related-to-bug: 5418914
* | Set crop params to ANative Window during Initialization.Lakshman Gowda2011-10-051-16/+22
|/ | | | | | | | | | | | The native_window_set_crop() is called when port reconfig event callback comes from decoder's and crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values. Since the default crop params are same as port reconfig crop params, the native_window_set_crop() is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight). By calling native_window_set_crop() during initilaization of output port of decoder ensures in setting up ANative window to crop region. Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688 Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
* 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
generated by cgit v1.1 at 2025-02-08 11:31:50 +0000