summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Report a runtime error instead of asserting on malformed avc ↵Andreas Huber2011-11-221-0/+4
|\ | | | | | | configuration data." into ics-mr1
| * Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-181-0/+4
| | | | | | | | | | Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845 related-to-bug: 5641069
* | Fix log spamming during time lapse video recordingJames Dong2011-11-212-4/+3
|/ | | | | | Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f related-to-bug: 5626569
* Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames ↵Hong Teng2011-11-151-5/+15
|\ | | | | | | in media_profiles.xml to limit the total memory usage." into ics-mr1
| * Fix for issue 5309336Hong Teng2011-11-141-5/+15
| | | | | | | | | | | | -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage. Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
* | Add support for retrieving location information in mp4/3gpp filesJames Dong2011-11-102-0/+2
|/ | | | | Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687 related-to-bug: 5560253
* Remove surface legacy APIs and code.Andreas Huber2011-10-283-5/+0
| | | | | | All surfaces are now supported through surface textures. Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
* am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ↵Jamie Gennis2011-10-281-3/+0
|\ | | | | | | | | | | | | ics-mr0 * commit '08479ceeba56c460fb52f60a24df27776f1936c3': Stagefright: ANW::connect in MediaPlayerService
| * Stagefright: ANW::connect in MediaPlayerServiceJamie Gennis2011-10-261-3/+0
| | | | | | | | | | | | | | | | This change moves the ANativeWindow connect and disconnect logic from MediaPlayer to MediaPlayerService::Client. Bug: 5502654 Change-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d
* | am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ↵Jamie Gennis2011-10-261-0/+1
|\ \ | |/ | | | | | | | | | | ics-mr0 * commit 'b7b4eaaa05284634d50d581d924a250f1194f66d': Stagefright: push blank buffers when tearing down
| * Stagefright: push blank buffers when tearing downJamie Gennis2011-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | 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-191-0/+3
|\ \ | |/ | | | | | | * commit '23d644202a44383bf008ff86f6faa3ea7e447290': Stagefright: idle OMX after ANW errors
| * Stagefright: idle OMX after ANW errorsJamie Gennis2011-10-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Support for an MPEG2 Program Stream extractor."Andreas Huber2011-10-131-1/+4
|\ \ | |/ |/|
| * Support for an MPEG2 Program Stream extractor.Andreas Huber2011-09-301-1/+4
| | | | | | | | Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
* | Set crop params to ANative Window during Initialization.Lakshman Gowda2011-10-051-0/+2
|/ | | | | | | | | | | | 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>
* Gracefuly return on detecting wrong AAC format from corrupted filesGilles-Arnaud Bleu-Laine2011-09-301-1/+1
| | | | | | | | | | | 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>
* Support AMR, G.711 and vorbis audio in ACodec and friends.Andreas Huber2011-09-281-0/+6
| | | | Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
* Propagate error signalled by the source all the way to the output EOS ↵Andreas Huber2011-09-261-0/+1
| | | | | | | notification. Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7 related-to-bug: 5372901
* Add QVGA resolution to CamcorderProfileJames Dong2011-09-191-2/+4
| | | | | Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b related-to-bug: 5145483
* Merge "Change an assert failure due to unsupported level by HW AVC decoder ↵James Dong2011-09-141-1/+1
|\ | | | | | | and report the error to applications"
| * Change an assert failure due to unsupported level by HW AVC decoder and ↵James Dong2011-09-131-1/+1
| | | | | | | | | | | | | | report the error to applications Change-Id: I522a994981d86329ccc86c3b536b561dc6e40eeb related-to-bug: 5300618
* | Merge "Issue 5298399: Lost speech after a crash in gTalk."Eric Laurent2011-09-131-0/+1
|\ \ | |/ |/|
| * Issue 5298399: Lost speech after a crash in gTalk.Eric Laurent2011-09-131-0/+1
| | | | | | | | | | | | | | | | 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
* | Turn an another assertion into a runtime error in ACodec's implementationAndreas Huber2011-09-121-0/+2
| | | | | | | | | | Change-Id: I6779b29f200b90d088273ab3204724ef3d8d59bd related-to-bug: 5284760
* | Make MediaScanner skip certain directoriesGuang Zhu2011-09-091-1/+5
|/ | | | | | | | | | 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
* Require INTERNET permission for network-based content.Dave Burke2011-09-023-11/+11
| | | | | | Bug #1870981 Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
* Merge "Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource"Pannag Sanketi2011-08-311-1/+1
|\
| * Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSourcePannag Sanketi2011-08-311-1/+1
| | | | | | | | | | | | | | The buffers in SurfaceMediaSource were 4 earlier, whereas we need 5 for one of the devices. Change-Id: I87bf5e28bbb0f7c9661dc01b040baa903d95d2c2
* | Merge "Fix SurfaceMediaSource timestamp handling."Eino-Ville Talvala2011-08-311-0/+7
|\ \
| * | Fix SurfaceMediaSource timestamp handling.Eino-Ville Talvala2011-08-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Was not basing timestamps on startTimeUs. Now synchronizes properly with audio. Bug: 4510826 Change-Id: I613db0aa91e51fc75d120e65540e742d8ab2ae43
* | | Merge "226483: A2DP connected, but music out to speaker"Eric Laurent2011-08-301-1/+6
|\ \ \ | |/ / |/| |
| * | 226483: A2DP connected, but music out to speakerEric Laurent2011-08-301-1/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the A2DP headset is connected, there is a possible race condition when the audio tracks are moved from the mixer thread attached to the speaker output to the thread attached to A2DP output. As the request to clear the stream type to output mapping cache in the client process is asynchronous, it is possible that the flag indicating to the client audio track to re-create the IAudioTrack on the new thread is processed before the cache is invalidated. In this case, the track will be attached to the old thread and music will continue playing over the device speaker instead of being redirected to A2DP headset. Change-Id: Ib2ce1eb5320eaff83287b93779061bf4e7a330df
* | Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"Pannag Sanketi2011-08-261-1/+1
|\ \ | |/ |/|
| * Modify enum value of OMX_COLOR_FormatAndroidOpaquePannag Sanketi2011-08-261-1/+1
| | | | | | | | | | | | The enum value chosen earlier had a conflict with one of the vendors. Change-Id: I47832dd1157447f89324d56e8ab146260cd7927c
* | Merge "Support for posting messages and synchronously waiting for a response."Andreas Huber2011-08-262-1/+23
|\ \ | |/ |/|
| * Support for posting messages and synchronously waiting for a response.Andreas Huber2011-08-252-1/+23
| | | | | | | | Change-Id: Id6c7a08c34fd5cb6c4632f78ece9e7898b29e52c
* | Bug 4364249 Play position is 0 after flushing AudioTrackJean-Michel Trivi2011-08-251-0/+1
|/ | | | | | | | | | | | | AudioTrack::stop() is not synchronous, so a stop() followed by flush(), which is synchronous, will not always report a playhead position of 0 after being called. This CL adds a flag to mark a track as flushed, and report the correct playhead position in this state. Bug 5217011 has been created to address the real issue in the future, where flush could be made synchronous, to properly address bug 4364249. Change-Id: Icf989d41a6bcd5985bb87764c287f3edb7e26d12
* Testing the GL/ CPU encoding w/ Gralloc buffersPannag Sanketi2011-08-242-5/+13
| | | | | | | | | | | | | | | This is the test for Gralloc buffers based encoding. contains a combination of two main changes: 1. GL based encoding tests added to SurfaceMediaSource_test 2. SurfaceMediaSource ::read() colorformat The SurfaceMediaSource::getformat() sets it to OMX_COLOR_FormatAndroidOpaque. The omx encoder needs to interpret that colorformat and reads the format from the Gralloc buffers directly Change-Id: Iee2fe8901384109a4952e1d6c528c59eb01eb5b1
* Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)Rajneesh Chowdury2011-08-191-1/+25
| | | | | | Also fixes 5118207 add other video codec support for video editor export. Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
* Error handling in ACodec and Nuplayer.Andreas Huber2011-08-161-2/+1
| | | | | | | Codec errors (and codec not found errors) now trigger a controlled shutdown of playback and signal errors to the MediaPlayer client. Change-Id: I2ee23ff2a1422d05a1a21e50ecb87d7c7ab958cc
* Audio effects: track CPU and memory use separatelyEric Laurent2011-08-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | Before this change, CPU and memory usage for an audio effect were registered and checked against the limit by audio policy manager upon effect instantiation. Even if an effect was not enabled it would prevent another effect to be created if the CPU load budget was exceeded, which was too restrictive. This change adds a method to register/unregister CPU load only when an effect is enabled or disabled. It also adds a mechanism to place all effects on the global output mix in suspend state (disabled) when an effect is enabled on a specific session. This will allow applications using session effects to have the priority over others using global effects. Also fixes some issues with suspend/restore mechanism: - avoid taking actions when an effect is disconnected and was not enabled. - do not remove a session from the suspended sessions list when corresponding effect chain is destroyed. Change-Id: I5225278aba1ae13d0d0997bfe26a0c9fb46b17d3
* Revert "Notify the OMX component that it's going to be used in "secure" mode."Andreas Huber2011-08-102-12/+0
| | | | This reverts commit 7616178271e95f009452a21ea45e7225997dc27a.
* Merge changes Ie06e73e5,I7ac6b5b0Mathias Agopian2011-08-091-1/+2
|\ | | | | | | | | | | * changes: free all buffers when ANativeWindow::disconnect is called return correct value from query after connecting a surface
| * return correct value from query after connecting a surfaceMathias Agopian2011-08-081-1/+2
| | | | | | | | | | | | | | | | | | | | the first time a surface was connected, the values returned by query NATIVE_WINDOW_DEFAULT_{WIDTH|HEIGHT} and NATIVE_WINDOW_TRANSFORM_HINT were wrong until a call to queueBuffer was performed. Bug: 5137366, 5121607 Change-Id: I7ac6b5b0daa876638f6bed7c20f286a6e6d984f6
* | Keep effects sessions active when the caller dies.Marco Nelissen2011-08-092-0/+5
|/ | | | | | | | Don't remove effects until the session they are in goes away or all AudioEffects have been explicitly released. This allows the control panel process to die without stopping the effects. Change-Id: I4496e5df080230ca1af149dec95c1309ab8ea888
* Notify the OMX component that it's going to be used in "secure" mode.Andreas Huber2011-08-082-0/+12
| | | | | Change-Id: Id87c4b295eb38f7d24045918e73df298d7b842f9 related-to-bug: 5137212
* Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBufferAndreas Huber2011-08-041-0/+4
| | | | | Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037 related-to-bug: 5122973
* Bug 4599730 Get audio channel count on MediaPlayerGlenn Kasten2011-07-271-4/+13
| | | | | | | Related changes: - Fix bug in get/setParameter* to recycle Parcels when done with them. Change-Id: Iaff05e91bbd99a14fccb79d816dd873359b6ae65
* Merge "Adding Metadata mode to SurfaceMediaSource"Pannag Sanketi2011-07-252-1/+15
|\