Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken
* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
Support for Ogg Vorbis decoding in stagefright.
Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp
* commit 'e083d0a2f50906423ab548047d436c74648fc488':
Support for Ogg Vorbis decoding in stagefright.
Set the magic property media.stagefright.enable-vorbis to true to use the new implementation instead of the standalon vorbis player for file-based playback. HTTP streaming of vorbis content will always go through stagefright.
Change-Id: Ie3843a99fadb22372f89540d0f8d65196e0c2af8
related-to-bug: 2654400
- Extend the audio recording to AAC format
- Add support for setting some recording parameters
- Add stss box to the meta data in the recorded file
Change-Id: I41167bfd9d70ef9cd33906f8437b39c232b6d3b7
Merge commit '31431b34f895862ae13efba30bb5771085572687' into kraken
* commit '31431b34f895862ae13efba30bb5771085572687':
Switch to use software MP3 decoder
Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.
bug - 2608400
Change-Id: Ia0b5b6521015fc8d3e086117fa914dcc20ace5bd
Merge commit 'f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken
* commit 'f6adae7866e893afa05b5838bdd244648a66ac3f':
Fix bug 2619062 Music is routed to Phone speaker, though it is
connected to A2DP media profile
When the phone is docked and using the dock A2DP, and the user
connects another A2DP device, make the dock unavailable immediately
before connecting the new A2DP device.
Change-Id: I82d53836fb509ee4ea7cdb68f467dfb946c634f8
Merge commit '89e28cbefaff6ae9499032bb446ae7e72e019466' into kraken
* commit '89e28cbefaff6ae9499032bb446ae7e72e019466':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
Merge commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab' into kraken
* commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab':
Update AudioService to reflect phone state changes with AudioFocus.
Phone calls and rings are treated as a new client, with a dedicated
client ID that identifies it in the audio focus stack. When it is
present in the stack, others clients cannot request audio focus
(request is denied).
Because the phone state is now mostly handled like a new client,
there is no need monitor mode changes and to keep track of
undispatched focus changes, as those will delayed focus gains
will now automatically happen at the end of the call when the
phone client is removed from the focus stack.
Change-Id: I11ff73b015ab93f07040755fd8ee75c8d675e025
Merge commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken
* commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place.
In certain edge cases (encoded audio track contains silence), each buffer would turn out to be an amazing 6(!!!) bytes, we'd spend lots and lots of time streaming network data to fill the codec's buffers of size 6144 bytes with .. silence.
Change-Id: I9f449f310fc64ca384bd02e4a783e33cf5b46fcc
related-to-bug: 2609049
QA-Impact: streamed (http) playback of aac audio content on Droid.
Merge commit '9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken
* commit '9d14e3ea22f48173070789951ee6dc64b507e13f':
When updating existing entries in the media database, don't update
the is_music, is_ringtone, etc columns. This ensures that custom
ringtones will still be shown in the ringtone picker after a rescan.
Bug 2594125
Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2
The problem occurs if the device is powered down in silent mode. When the device restarts,
AudioService reads current ringer mode from saved settings but does not call setRingerModeInt()
to perform actions required when ringer mode changes.
The volumes of streams affected by ringer mode are actually at 0 because they are also read from settings
but their mute state is not applied correclty. When we later exit from silent mode, the streams
other than STREAM_RING that are affected by ringer mode are not restored as they are not considered
muted. This applies to STREAM_SYSTEM but also to STREAM_NOTIFICATION if its volume is controlled independently
from STREAM_RING.
The fix consists in calling setRingerModeInt() when AudioService starts.
Change-Id: Ica75b9874938dda1bc1b634c3e97db4a650d295c
Merge commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd' into kraken
* commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd':
Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
There was a regression introduced by change 4c637b9e34f4c8db69a64ad21a4e2bcfa7485b5f
fixing issue 2578813. As the A2DP device disconnection is notified to the audio policy manager
after a delay, there is a period during which the A2DP device is actually not connected but the
A2DP output is considered present by audio framework. If a playback is started during this period,
The A2DP output requests the activation of the A2DP sink which in turn triggers a reconnection
of the A2DP sink.
The fix consists in suspending the A2DP output immediately when receiving the A2DP disconnection
intent so that any activity on A2DP output is ignored until the output is actually closed by the
audio policy manager.
Change-Id: I16eaace45e12bfc970f50836b46a73b756b493f0
Merge commit 'def7db5b79e5c178834375020ef6b590e80af42f' into kraken
* commit 'def7db5b79e5c178834375020ef6b590e80af42f':
Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken
* commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
Merge commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken
* commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677':
Use PV_PLAYER to handle RTSP streaming
This is a regression introduced by change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7 for issue 2472495.
When AudioService changes audio mode, setMode() reapplies current volume for the default active stream
which in this case is STREAM_RING.
Because the new implementation of silent mode actually mutes the ringer stream,
setStreamVolumeInt() now applies the volume change received while in silent mode
to the last audible value and we end up clearing the last audible volume for ringer.
The fix consists in not modifying last audible value when the new value is 0.
Also removed obsolete code in setStreamVolumeInt() since new implementation of setRingerModeInt()
in change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7.
Change-Id: I746f3bc1af39a602ce12d130ce592007b2d0ebb6
