Merge commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527'
* commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6' into eclair-mr2-plus-aosp
* commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-mr2
* commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1'
* commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1':
New API to instantiate a MediaExtractor given a URI and optional MIME type.
Merge commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff' into eclair-mr2-plus-aosp
* commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff':
New API to instantiate a MediaExtractor given a URI and optional MIME type.
Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af'
* commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af':
Moving the individual extractor headers files to the private include directory.
Also DataSources now must provide a method initCheck()
and DataSource::reat_at has been renamed to readAt to conform to
standard API naming guidelines.
Merge commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56' into eclair-mr2-plus-aosp
* commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56':
Moving the individual extractor headers files to the private include directory.
Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9'
* commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9':
Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit 'ad28543022101d0b01845e3f53dcd57e524816ef' into eclair-mr2-plus-aosp
* commit 'ad28543022101d0b01845e3f53dcd57e524816ef':
Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c'
* commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c':
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
Merge commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476'
* commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead' into eclair-mr2-plus-aosp
* commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead':
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
Merge commit '470687e251ecb298bda17f3e3978ffeaf05622a9' into eclair-mr2-plus-aosp
* commit '470687e251ecb298bda17f3e3978ffeaf05622a9':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
While our hardware decoders clearly outperform the software decoders in terms
of raw throughput, their startup latency makes them less suitable for thumbnail
extraction.
Merge commit 'dd28d56368441537ec5eb42150516416fdbf10ad' into eclair-mr2
* commit 'dd28d56368441537ec5eb42150516416fdbf10ad':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3'
* commit '7453da3f420b74f5bb135d5895b82dca9c015bb3':
Extract video thumbnails from the largest sync sample among the first 20.
Merge commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732' into eclair-mr2-plus-aosp
* commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732':
Extract video thumbnails from the largest sync sample among the first 20.
Merge commit '0c012efaab175a46df0cb217e639f414495e4a1b'
* commit '0c012efaab175a46df0cb217e639f414495e4a1b':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b' into eclair-mr2-plus-aosp
* commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2
* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330'
* commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp
* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
Added setVoiceVolume() method to AudioSystem, AudioFlinger, IAudioFlinger, AudioPolicyService.
Removed call to AudioHardwareInterface::setVoiceVolume() from AudioFlinger::setStreamVolume().
Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
Merge commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd'
* commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd':
Avoid signaling a format change to the client if its insubstantial.
Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp
* commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba':
Avoid signaling a format change to the client if its insubstantial.
For example, the original port settings change may just indicate a change
in the number of buffers to allocate, which won't be visible to the client
in any case.
Merge commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d'
* commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f' into eclair-mr2-plus-aosp
* commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2
* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp
* commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d':
Reimplement the OMX backend for stagefright.
Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.
Changed APIs to conform to the rest of the system.
