1557 Commits

Author SHA1 Message Date
Eric Laurent
758dd527f6 Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in 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
2010-04-14 10:52:01 -07:00
Eric Laurent
745b43c28f Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 2010-04-14 10:39:32 -07:00
Eric Laurent
527c3ab51e Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
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
2010-04-14 09:32:17 -07:00
James Dong
42d66573ff Use PV_PLAYER to handle RTSP streaming
bug - 2594865

Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
2010-04-14 08:57:14 -07:00
James Dong
e1130662d0 Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
bug - 2575956

Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
2010-04-13 15:09:26 -07:00
Andreas Huber
db281311a0 Merge "Better 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" in addition to "-a"." into froyo 2010-04-13 12:16:08 -07:00
James Dong
c15f48d7d6 Merge "Don't set encoder component role while we query decoders" into froyo 2010-04-13 12:11:57 -07:00
Andreas Huber
662292ae2d Better 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" in addition to "-a".
related-to-bug: 2553359
Change-Id: Ic49eb89feb62474d9513bc21571e0e8fe3a15e0b
2010-04-13 12:04:05 -07:00
James Dong
722d591842 Don't set encoder component role while we query decoders
bug - 2558515

Change-Id: I29683507d234d963994c782c07508034ea807739
2010-04-13 10:58:41 -07:00
Jean-Michel Trivi
c30890e102 Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 09:53:35 -07:00
Gloria Wang
b19da8e187 Fix for 2581725. Keep the last frame after resume(), and delete it
in the next suspend() or reuse it if no new frame is available.

Change-Id: I84286030eaae9061077d6ccb485b7dd53ef05341
2010-04-13 09:46:40 -07:00
Jean-Michel Trivi
4c637b9e34 Fix bug 2578813 Delay pausing music and routing audio for car docks
Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService
to AudioService.
Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP
device.
Disconnect from A2DP docks with a delay to handle transient
disconnections.
Cancel delayed A2DP disconnections when connecting to a dock as this
can be a reconnection after a transient disconnection.

Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
2010-04-13 09:44:08 -07:00
Daniel Sandler
bcac496076 Honor the "Never vibrate" setting for incoming calls.
Bug: 2579295
Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8
2010-04-13 12:18:44 -04:00
Andreas Huber
d0332ad8d2 Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af
related-to-bug: 2587341
2010-04-12 16:05:57 -07:00
Andreas Huber
6dbf80d086 Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo 2010-04-12 14:16:34 -07:00
Andreas Huber
ea1d6712fe Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Change-Id: I4e42e318fd5373d1f352f54027d4bf823126266d
related-to-bug: 2585276
2010-04-12 13:15:48 -07:00
Jean-Michel Trivi
12221b6f7c Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo 2010-04-12 12:05:08 -07:00
Andreas Huber
1d7a8b448e Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo 2010-04-12 11:02:27 -07:00
Andreas Huber
8f14c55248 Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
Change-Id: I4cabd18709c29db0a2763a01cc86525ba0b0aeb7
related-to-bug: 2575976
2010-04-12 10:20:12 -07:00
Andreas Huber
cdded187d2 Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 2010-04-12 10:11:32 -07:00
Andreas Huber
3f26cade62 Ignore corrupt aac audio frames and substitute silence.
Change-Id: I544f98a5c00d912061db7921fc4518435209b168
related-to-bug: 2575976
2010-04-12 09:57:05 -07:00
Andreas Huber
040301cad1 Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Change-Id: Ieaa90cc9b54bd56963aa5f4daced2ba243801acf
related-to-bug: 2585913
2010-04-12 09:41:12 -07:00
Jean-Michel Trivi
2930bb2d47 Fix monkey bug 2586534 java.util.ConcurrentModificationException
Unlike the other audio focus and media button stack handling
methods, abandonAudioFocus() and unregisterAudioFocusClient() were
not synchronized around their focus stack. This CL corrects this.

Change-Id: I5ada574e4e163fa95da9dad2fefe610b48303320
2010-04-09 19:27:58 -07:00
Yu Shan Emily Lau
15b02f04c7 Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 2010-04-09 16:41:37 -07:00
Yu Shan Emily Lau
42349d03bf Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Change-Id: I26e48366998e3692ad8a3394a0a0241832e99a6d
2010-04-09 13:53:56 -07:00
Andreas Huber
4be2461f06 Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 07:01:58 -07:00
Andreas Huber
c944cbe28e Support for ID3 V2.4 tags.
Change-Id: I74ee02451bdfd7e50f0d5ff6fa5da5147b683e4c
related-to-bug: 2581869
2010-04-08 14:09:54 -07:00
Andreas Huber
aba965fdd8 Refactor connection/redirection code, support redirects on reconnection.
Change-Id: Id2517568000e028b01553c06a4893813a6883168
related-to-bug: 2580785
2010-04-08 10:09:35 -07:00
Andreas Huber
a51250bdc7 Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Change-Id: Ic9a6ef204362bc9afdc61e081c76bc62e5ef92ad
related-to-bug: 2580785
2010-04-08 07:51:20 -07:00
Marco Nelissen
e43e563e73 Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo 2010-04-07 13:28:51 -07:00
Ray Chen
25c2dd60d4 Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 12:05:58 -07:00
Marco Nelissen
97a9c6a7bb Don't check whether a specific named activity supports mp3 playback,
just that there is at least one that does.
Fixes bug 2534382.
Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c
2010-04-07 10:40:39 -07:00
Andreas Huber
ddb709c45e Report the requested seek time while seek is in progress.
Change-Id: I862bfb801701f9ce54dede51c492e4eb37591894
related-to-bug: 2576102
2010-04-07 10:35:18 -07:00
Ray Chen
b7c8c76180 Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
http://2553871

Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
2010-04-07 10:14:04 -07:00
Andreas Huber
548b7999fe Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491
2010-04-06 14:36:23 -07:00
Ray Chen
44dcf65871 Make createVideoThumbnail and createImageThumbnail look consistent.
Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
2010-04-05 13:06:39 -07:00
Andreas Huber
eb6e3edc0f Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:03:46 -07:00
Andreas Huber
a4357addf6 Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064
related-to-bug: 2548426
2010-04-02 12:55:31 -07:00
Andreas Huber
29039deea9 Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:18:32 -07:00
Jean-Michel Trivi
9ab05fff41 Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 2010-04-02 08:53:42 -07:00
Dave Sparks
db6cc0ba71 Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
MediaMetadataRetriever uses a single static lock for all operations.
This effectively serializes all metadata retrieval operations in a
single process. This patch uses the object level lock for all normal
operations and only uses the static lock to serialize calls to
release.

Change-Id: I81c9f234c2f0007a26d18e1398c709b41a4dbbd7
2010-04-01 18:08:22 -07:00
Jean-Michel Trivi
55d1bb3483 Fix bug 2565463 Ensure an object cannot appear twice in the
AudioFocus stack.
 Enforce parameter check in AudioManager.requestAudioFocus()
 Typo correction in AudioService.unregisterMediaButtonEventReceiver()

Change-Id: Iedd6081a2a096bd7effbaeb9f888a31691201b3b
2010-04-01 17:40:58 -07:00
Yu Shan Emily Lau
e11bafec8d Add the test template for the media audio manager test.
Change-Id: I55b5de0c55dbfded8d972f7378da3c19a613978c
2010-04-01 16:11:49 -07:00
Andreas Huber
eea1eefead Support another kind of iso mpeg4 file.
Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7
related-to-bug: 2558114
2010-04-01 11:42:50 -07:00
James Dong
ccc17b34fe Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo 2010-04-01 10:33:45 -07:00
Dave Sparks
49e5a4c5be Update AMR codec.
Change-Id: I8ecd2712863f6962b762f26898002912d1c77afb
2010-04-01 09:16:05 -07:00
James Dong
e64d9a236e Public API changes for CameraProfile and CamcorderProfile classes
1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final”
2. CamcorderProfile.Quality: use an int rather than an enum
3. Add API on MediaRecorder to pass in a CamcorderProfile
4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile
5. Remove a convenient method and instead let the (mms) app do that task

bug - 2553862

Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
2010-04-01 00:12:20 -07:00
Jean-Michel Trivi
3ce1648fce Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo 2010-03-31 13:40:42 -07:00
Jean-Michel Trivi
7f7e67f1b6 Fix bug 2553575 API REVIEW: android.media Change 1 of 3
Notes from API Council review:
  Rename onAudioFocusChanged -> onAudioFocusChange

Change-Id: I8296cc84381506dabe8a9ceb1b5e3c0ab6d4af25
2010-03-31 12:08:26 -07:00
Andreas Huber
804878f3a3 Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo 2010-03-31 11:33:19 -07:00