summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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"
| * | | If release has been called before finalize, do not expect MediaPlayer still ↵James Dong2011-08-121-5/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | exists o also, we should releae the surface object when release is called, not wait until finalize is called. related-to-bug: 5157956 Change-Id: I0233ad61d8349c3e3800de68b752b9548ece1742
* | | Add a null check to handle failure of android::createPlayerJason Simmons2011-08-121-1/+3
| | | | | | | | | | | | Change-Id: Id56bd0c16104e46d8dc71f13d8a44aefe251fad4
* | | Merge "Fix issue 5144429: CTS test fails for AudioEffects"Eric Laurent2011-08-122-2/+49
|\ \ \
| * | | Fix issue 5144429: CTS test fails for AudioEffectsEric Laurent2011-08-112-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android_media_AudioEffect_native_setup() was not initializing properly the effect descriptor for audio pre processings. AudioEffect tests should create per processing effects on a valid AudioRecord session. Change-Id: Ia1862ca91c98e272f9374b9225a7d4ce7ef132fc
* | | | Merge "Fix the software AAC decoder's AAC+ detection to ignore malformed frames"Andreas Huber2011-08-121-2/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix the software AAC decoder's AAC+ detection to ignore malformed framesAndreas Huber2011-08-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | at the beginning of the stream. Change-Id: Ib990848c696896e7d43c80dec8119dec35704b74 related-to-bug: 5122512
* | | | Merge "Pass flags on remote control client information change in intent"Jean-Michel Trivi2011-08-123-70/+35
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Pass flags on remote control client information change in intentJean-Michel Trivi2011-08-113-70/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the flags about what information changed in the remote control client in the intent used by the remote control display. Also pass the IRemoteControlClient to verify it is still current before sending the intent. Marked some logs as to be removed before release. Change-Id: Ib3aa22d061e5dfaf80a9c4c78774c931a2cf0fbd
* | | Remove ParcelSurfaceTexture and update MediaPlayerTed Bonkenburg2011-08-112-96/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the ParcelSurfaceTexture class since that functionality has been folded into Surface.java. The change also updates the MediaPlayer to get rid of setParcelSurfaceTexture() and modifies setTexture() to use the new Surface functionality in order to simplify the code. Change-Id: Iafa75ea3188263928128325d8a726786971b4de4
* | | Only set the ringtones and such if this is the first media scanMarco Nelissen2011-08-111-3/+7
| | | | | | | | | | | | | | | | | | b/5126979 Change-Id: Ibef2bd5a3a1a288fc1137694e858d87628d780c0
* | | Merge "Audio effects: track CPU and memory use separately"Eric Laurent2011-08-112-1/+27
|\ \ \
| * | | Audio effects: track CPU and memory use separatelyEric Laurent2011-08-112-1/+27
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, CPU and memory usage for an audio effect were registered and checked against the limit by audio policy manager upon effect instantiation. Even if an effect was not enabled it would prevent another effect to be created if the CPU load budget was exceeded, which was too restrictive. This change adds a method to register/unregister CPU load only when an effect is enabled or disabled. It also adds a mechanism to place all effects on the global output mix in suspend state (disabled) when an effect is enabled on a specific session. This will allow applications using session effects to have the priority over others using global effects. Also fixes some issues with suspend/restore mechanism: - avoid taking actions when an effect is disconnected and was not enabled. - do not remove a session from the suspended sessions list when corresponding effect chain is destroyed. Change-Id: I5225278aba1ae13d0d0997bfe26a0c9fb46b17d3
* | | Add Bluetooth SCO test appMarco Nelissen2011-08-119-0/+943
| |/ |/| | | | | Change-Id: I6c0c267fbb546b6db544e5ddb03e65276895e0e0
* | Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB ↵Kristian Monsen2011-08-111-1/+2
|\ \ | |/ |/| | | in ICS vs HCMR2"
generated by cgit v1.1 at 2025-03-15 12:38:34 +0000