summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 32de26bb: am c8652199: merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
|\
| * am c8652199: merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d' into kraken * commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d': speling fix
| | * merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
| | |\ | | | | | | | | | | | | Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
| | | * speling fixhugh kennedy2010-04-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ia9db6e1c5d1cd31fd028d551cc357a76049ce137
* | | | am b30bf6ef: Merge "Use timestamp from camera driver for CameraSource" into ↵James Dong2010-04-285-68/+118
|\ \ \ \ | |/ / / | | | | | | | | kraken
| * | | Use timestamp from camera driver for CameraSourceJames Dong2010-04-285-68/+118
| | | | | | | | | | | | | | | | Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
* | | | am 40eb3f7b: am 31431b34: am 374aee68: Switch to use software MP3 decoder ↵James Dong2010-04-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.
| * | | am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 ↵James Dong2010-04-261-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder could lead to hang in the Music application, although the chance is very low. Merge commit '31431b34f895862ae13efba30bb5771085572687' into kraken * commit '31431b34f895862ae13efba30bb5771085572687': Switch to use software MP3 decoder
| | * | Switch to use software MP3 decoderJames Dong2010-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low. bug - 2608400 Change-Id: Ia0b5b6521015fc8d3e086117fa914dcc20ace5bd
* | | | am 460587e9: am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is ↵Jean-Michel Trivi2010-04-231-2/+17
|\ \ \ \ | |/ / / | | | | | | | | routed to Phone speaker, though it is connected to A2DP media profile" into froyo
| * | | am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone ↵Jean-Michel Trivi2010-04-231-2/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | speaker, though it is connected to A2DP media profile" into froyo Merge commit 'f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken * commit 'f6adae7866e893afa05b5838bdd244648a66ac3f': Fix bug 2619062 Music is routed to Phone speaker, though it is
| | * | Fix bug 2619062 Music is routed to Phone speaker, though it isJean-Michel Trivi2010-04-231-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am f5e20801: am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not ↵Andreas Huber2010-04-202-27/+14
|\ \ \ \ | |/ / / | | | | | | | | 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." into froyo
| * | | am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately ↵Andreas Huber2010-04-202-27/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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." into froyo 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 "Apparently select() does not immediately return if one of the masked ↵Andreas Huber2010-04-202-27/+14
| | |\ \ | | | | | | | | | | | | | | | socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
| | | * | Apparently select() does not immediately return if one of the masked socket ↵Andreas Huber2010-04-202-27/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead. Change-Id: Ic2d4a8f5b6bbf16772fba39377809ec68d249c1f related-to-bug: 2611257
* | | | | am 219dbb67: am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect ↵Jean-Michel Trivi2010-04-201-29/+52
|\ \ \ \ \ | |/ / / / | | | | | | | | | | 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
| * | | | am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect phone state ↵Jean-Michel Trivi2010-04-201-29/+52
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 clie Merge commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab' into kraken * commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab': Update AudioService to reflect phone state changes with AudioFocus.
| | * | | Update AudioService to reflect phone state changes with AudioFocus.Jean-Michel Trivi2010-04-201-29/+52
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am c9553f2e: am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than ↵Andreas Huber2010-04-201-2/+12
|\ \ \ \ | |/ / / | | | | | | | | 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." into fro
| * | | am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of ↵Andreas Huber2010-04-201-2/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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." into froyo Merge commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken * commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0': Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
| | * | Merge "Don't coalesce more than 250ms worth of encoded data into a single ↵Andreas Huber2010-04-201-2/+12
| | |\ \ | | | | | | | | | | | | | | | 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." into froyo
| | | * | Don't coalesce more than 250ms worth of encoded data into a single codec ↵Andreas Huber2010-04-201-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | am fe13eebe: am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries ↵Marco Nelissen2010-04-201-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | 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-I
| * | | | am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media ↵Marco Nelissen2010-04-201-2/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I56761240d Merge commit '9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken * commit '9d14e3ea22f48173070789951ee6dc64b507e13f': When updating existing entries in the media database, don't update
| | * | | Merge "When updating existing entries in the media database, don't update ↵Marco Nelissen2010-04-201-2/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | 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" into froyo
| | | * | | When updating existing entries in the media database, don't updateMarco Nelissen2010-04-201-2/+6
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 5b550c9e: am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter ↵Eric Laurent2010-04-201-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | sound not playing.
| * | | | am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-201-0/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '11bae14009d91c063780b2cafee2fc4fb660c08c' into kraken * commit '11bae14009d91c063780b2cafee2fc4fb660c08c': Fix issue 2602879: camera shutter sound not playing.
| | * | | Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am e33e9db6: am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto ↵Eric Laurent2010-04-201-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | connects to Car Dock (Media profile) after undocking.
| * | | | am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car ↵Eric Laurent2010-04-201-0/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dock (Media profile) after undocking. Merge commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd' into kraken * commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd': Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
| | * | | Fix issue 2604270 Device auto connects to Car Dock (Media profile) after ↵Eric Laurent2010-04-201-0/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 5c14f2d0: am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer ↵Eric Laurent2010-04-151-17/+9
|\ \ \ \ | |/ / / | | | | | | | | volume forced to 0 when receiving a call in silent mode.
| * | | am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 ↵Eric Laurent2010-04-141-17/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | when receiving a call in silent mode. Merge commit 'def7db5b79e5c178834375020ef6b590e80af42f' into kraken * commit 'def7db5b79e5c178834375020ef6b590e80af42f': Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
| | * | Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in ↵Eric Laurent2010-04-141-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | silent mode. 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
* | | | am 5db9adfd: am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ↵Eric Laurent2010-04-151-0/+3
|\ \ \ \ | |/ / / | | | | | | | | ringer volume to 0 outside of silent mode." into froyo
| * | | am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer ↵Eric Laurent2010-04-141-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | volume to 0 outside of silent mode." into froyo Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken * commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1': Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
| | * | Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent ↵Eric Laurent2010-04-141-0/+3
| | |\ \ | | | | | | | | | | | | | | | mode." into froyo
| | | * | Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.Eric Laurent2010-04-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem happens only if volume down key is pressed while already in silent or vibrate mode. In this case, AudioService accepts changing the last audible index for ringer volume from 1 to 0. When volume up is pressed, current ringer volume value is restored from 0 instead of 1. The fix consists in keeping last audible index at 1 once in silent of vibrate mode even is volume down key is pressed. Change-Id: Id08edd12ce985c22233124545eba2c3e4b8cdc8e
* | | | | am fff02afa: am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP ↵James Dong2010-04-151-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | streaming" into froyo
| * | | | am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" ↵James Dong2010-04-141-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken * commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677': Use PV_PLAYER to handle RTSP streaming
| | * | | Use PV_PLAYER to handle RTSP streamingJames Dong2010-04-141-0/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | bug - 2594865 Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
* | | | am 31a17033: fix unintentional driftJean-Baptiste Queru2010-04-152-14/+23
|\ \ \ \ | |/ / /
| * | | fix unintentional driftJean-Baptiste Queru2010-04-142-14/+23
| | | | | | | | | | | | | | | | Change-Id: I0bbf3d3f95296a41d71558d8de1ed2ed021f21cf
* | | | am 748a8df0: am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP ↵James Dong2010-04-131-0/+2
|\ \ \ \ | |/ / / | | | | | | | | file types according to http://www.ftyps.com/3gpp.html" into froyo
| * | | am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types ↵James Dong2010-04-131-0/+2
| |\ \ \ | | | | | | | | | | | | | | | according to http://www.ftyps.com/3gpp.html" into froyo
| | * \ \ am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to ↵James Dong2010-04-131-0/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://www.ftyps.com/3gpp.html" into froyo Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken * commit '4f3257cf4667aa28908c401634db849fd2e516af': Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
| | | * | Snif more 3GPP file types according to http://www.ftyps.com/3gpp.htmlJames Dong2010-04-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 2575956 Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
* | | | | am 5ab60ba0: am d760afc3: am 30e9c2d4: am db281311: Merge "Better ↵Andreas Huber2010-04-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o