summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ ↵Rajneesh Chowdury2011-08-1916-415/+734
|\ | | | | | | Java)"
| * Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)Rajneesh Chowdury2011-08-1916-415/+734
| | | | | | | | | | | | Also fixes 5118207 add other video codec support for video editor export. Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
* | Merge "Stagefright: fix a compiler warning"Jamie Gennis2011-08-191-1/+1
|\ \ | |/ |/|
| * Stagefright: fix a compiler warningJamie Gennis2011-08-111-1/+1
| | | | | | | | Change-Id: Ia6b2027dfe80960450156d918bdd7fe1567cafea
* | Raise the maximum input buffer size for the vpx video decoder to 256KBAndreas Huber2011-08-191-1/+1
| | | | | | | | | | Change-Id: I0411763829bf186d1b3b679fa72c9051524506b4 related-to-bug: 5169641
* | Merge "Fix 5144356: Native crash while importing music"Chih-Chung Chang2011-08-181-18/+19
|\ \
| * | Fix 5144356: Native crash while importing musicChih-Chung Chang2011-08-181-18/+19
| | | | | | | | | | | | | | | | | | | | | 1. Use the correct Get*Field functions according to the field type. 2. When we have exceptions, return. Change-Id: I1878d806e26798a0977ff71a781551088e45f6fb
* | | Merge "When switching surface, do not set mSeekNotificationSent as true, ↵Gloria Wang2011-08-181-4/+5
|\ \ \ | | | | | | | | | | | | because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug 5181272."
| * | | When switching surface, do not set mSeekNotificationSent as true,Gloria Wang2011-08-181-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug 5181272. Change-Id: I290aff29b6d9ec8db67c66abbe1f352a43f57073
* | | | Merge "Some decoders require more gentle treatment"Andreas Huber2011-08-182-14/+45
|\ \ \ \
| * | | | Some decoders require more gentle treatmentJames Dong2011-08-182-14/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We sacrifice A/V sync to some extent to enable the decoder to recover from temporary bottlenecks. Change-Id: I16195091ad752bfad4c70869cdd7e9f28ca3a118 related-to-bug: 5180142
* | | | | Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. ↵Andreas Huber2011-08-181-1/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | recording. Change-Id: I982e740e8488ff8717ca5f081db9def55aabc9ec related-to-bug: 5179033
* | | | Merge "Fix for 5155561 During export, progress bar jumps from 0 to 50%"Rajneesh Chowdury2011-08-181-25/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix for 5155561 During export, progress bar jumps from 0 to 50%Rajneesh Chowdury2011-08-171-25/+49
| | | | | | | | | | | | | | | | Change-Id: I5f5814a1212cd242535ae7cadec8a76f099e78ce
* | | | Merge "Bug 5045498 RemoteControlClient interface"Jean-Michel Trivi2011-08-175-209/+400
|\ \ \ \
| * | | | Bug 5045498 RemoteControlClient interfaceJean-Michel Trivi2011-08-175-209/+400
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a RemoteControlClient interface that applications must implement and register to be displayed on the lockscreen. Change-Id: I67276ae653f203e76727432231f1d76535c31942
* | | | | Merge "Fix issue 5126270: Holding volume down vibrates"Eric Laurent2011-08-171-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix issue 5126270: Holding volume down vibratesEric Laurent2011-08-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear AudioManager.FLAG_VIBRATE in adjustStreamVolume() if already in silent mode. Change-Id: I8035a8cc713e1880799d9aaf053d8e4d12acad75
* | | | | Merge "Make sure we have all the sample table metadata before declaring a ↵Andreas Huber2011-08-173-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | track valid."
| * | | | | Make sure we have all the sample table metadata before declaring a track valid.Andreas Huber2011-08-173-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31 related-to-bug: 5178976
* | | | | | Merge "Don't time out prematurely for video encoding waiting for output buffers"James Dong2011-08-171-1/+8
|\ \ \ \ \ \
| * | | | | | Don't time out prematurely for video encoding waiting for output buffersJames Dong2011-08-161-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o For timelapse video encoding, the timelapse between two neighoring input frames could be very long Change-Id: I2b6f9c392f2237deae71c894efc7fc3692431796 related-to-bug: 5160548
* | | | | | | Merge "Change condition to enter silent mode."Eric Laurent2011-08-171-8/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Change condition to enter silent mode.Eric Laurent2011-08-161-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, silent mode was entered if volume was already at 0 and volume down key was pressed once. The new volume management policy specifies that silent mode is entered when volume is at last audible step and volume down key is pressed once. Pressing volume down key continuously will decrease volume until last audible step is reached, not 0. Change-Id: Ib7b530668473d6a5af1e748f445d6185afed2158
* | | | | | | Merge "Display thumbnails one by one and cache them."Chih-Chung Chang2011-08-177-144/+139
|\ \ \ \ \ \ \
| * | | | | | | Display thumbnails one by one and cache them.Chih-Chung Chang2011-08-167-144/+139
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I10808f5bca475aea924817bf532dc5916438563a
* | | | | | | Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB ↵Kristian Monsen2011-08-171-4/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | in ICS vs HCMR2"
| * | | | | | | Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS ↵Kristian Monsen2011-08-161-4/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vs HCMR2 Reenabling chromium as a shread lib Change-Id: I5f7abe61624d812c5781c4a453f587e744bc082d
* | | | | | | Merge "Use camcorder profiles for MediaRecorderStressTest"James Dong2011-08-161-14/+14
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Use camcorder profiles for MediaRecorderStressTestJames Dong2011-08-151-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 5167351 Change-Id: Ia21ca39a404484b2dda25c6101780d2ff11c4623
* | | | | | | Merge "Error handling in ACodec and Nuplayer."Andreas Huber2011-08-164-64/+63
|\ \ \ \ \ \ \
| * | | | | | | Error handling in ACodec and Nuplayer.Andreas Huber2011-08-164-64/+63
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Codec errors (and codec not found errors) now trigger a controlled shutdown of playback and signal errors to the MediaPlayer client. Change-Id: I2ee23ff2a1422d05a1a21e50ecb87d7c7ab958cc
* | | | | | | Properly initialize some instance variables.Andreas Huber2011-08-161-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I190b889be343dca14fe8109528be14cc3cdd4c34
* | | | | | Merge "Fix issue 5131056: key beeps when screen is locked"Eric Laurent2011-08-151-2/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix issue 5131056: key beeps when screen is lockedEric Laurent2011-08-151-2/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear AudioManager.FLAG_PLAY_SOUND in AudioService adjustSuggestedStreamVolume() if keyguard is locked. Change-Id: I2effb9cab8d946845e948b28899b17d7f24c1282
* | | | | Merge "Bug 5045498 javadoc for the remote control client API"Jean-Michel Trivi2011-08-152-22/+171
|\ \ \ \ \
| * | | | | Bug 5045498 javadoc for the remote control client APIJean-Michel Trivi2011-08-152-22/+171
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a8aeffd94c4f9e93a1be459be8e45d595438f38
* | | | | | Merge "Bug 5045498 Send media button event receiver to remote control"Jean-Michel Trivi2011-08-152-2/+18
|\ \ \ \ \ \
| * | | | | | Bug 5045498 Send media button event receiver to remote controlJean-Michel Trivi2011-08-152-2/+18
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When notifying the remote controls of an update, also pass the associated media button event receiver. Change-Id: I9125378653ce21e3bd672b936df638c0c6154edb
* | | | | | Merge "Deprecate use of some audio effects on output mix."Eric Laurent2011-08-154-29/+30
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Deprecate use of some audio effects on output mix.Eric Laurent2011-08-154-29/+30
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The possibility for applications to apply insert audio effects (Equalizer, BassBoost, Virtualizer) on global output mix has brought up a number of issue. This change updates the java doc for audio effects indicating that application should not apply insert effects globaly anymore as this behavior will soon be deprecated. The audio framework will still allow global insert effects during an interim period but will give the priority to effects inserted on particular player by disabling global effects when both are present. ============ Change-Id: If87f1944a0409d45d8d2eee66ff331f95965ca89
* | | | | Speed up thumbnail generation.Chih-Chung Chang2011-08-155-53/+28
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to have precise position for thumbnails, so we add a tolerance parameter to the decoder. The decoder can return an earlier frame within the tolerance time given. Change-Id: I0a49ed6b03f8c3264606e4143dd5ecf48e9d0f62
* | | | Merge "Fail request for audio focus when linkToDeath fails"Jean-Michel Trivi2011-08-141-12/+13
|\ \ \ \
| * | | | Fail request for audio focus when linkToDeath failsJean-Michel Trivi2011-08-141-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting audio focus and linkToDeath() threw a RemoteException, AudioService was only logging a warning, and was still changing the focus, with a non-null death handler. The change first check that linkToDeath() didn't fail, and only then proceeds to change the focus (dispatch focus change notification, updates the focus stack, and updates the remote controls). Change-Id: I0b96dd3c6e924d93f419880349d49f8b360b110b
* | | | | Merge "MediaScanner: Clear file path before deleting records to avoid ↵Mike Lockwood2011-08-141-7/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | accidental file deletions"
| * | | | MediaScanner: Clear file path before deleting records to avoid accidental ↵Mike Lockwood2011-08-141-7/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file deletions Bug: 5140112 See also http://code.google.com/p/android/issues/detail?id=3692 Change-Id: I971eea83a2f3986a0b0ea018b7211f2525b914ab Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "Fix leak of global references and AudioFocusDeathHandler objects."Jean-Michel Trivi2011-08-141-14/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Fix leak of global references and AudioFocusDeathHandler objects.Jean-Michel Trivi2011-08-141-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to call unlinkToDeath() for the object to be garbage collected. Save the object in the FocusStackEntry, unlink to death when we remove it from the stack. See http://b/issue?id=5048400 Change-Id: I84c5ba46017d0a8744b5e7509a7c7a5c8dd918fb author: olivier@google.com
* | | | Issue 5081351: isWiredHeadsetOn() permission.Eric Laurent2011-08-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioManager.isWiredHeadsetOn() should not require permission MODIFY_AUDIO_SETTINGS. Remove permission checks on all getters in audio policy manager as permission enforcement is really usefull for setters. Also deprecate AudioManager.isWiredHeadsetOn() which name and implementation are deceptive. Change-Id: I38f8df7c26c0d417bf0e2b74e4c11c2d143f2ecd
* | | | Merge "If release has been called before finalize, do not expect MediaPlayer ↵James Dong2011-08-121-5/+13
|\ \ \ \ | | | | | | | | | | | | | | | still exists"