summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Clean up imports"Glenn Kasten2013-08-051-2/+0
|\ \ \ \ \
| * | | | | Clean up importsGlenn Kasten2013-08-021-2/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to import java.lang.*; these imports are implicit in the language. Change-Id: Ia903fb9546f2a295605dbc80ba69c4e6778627d6
* | | | | Merge "Clean up throws in AudioRecord and AudioTrack"Glenn Kasten2013-08-052-32/+19
|\ \ \ \ \
| * | | | | Clean up throws in AudioRecord and AudioTrackGlenn Kasten2013-08-022-32/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dead assignments to member fields in constructor prior to throw. Execution doesn't continue execution, so no need to initialize fields. throw doesn't need parentheses. Fix indentation. Change-Id: I2bf1b8bfa2c836e53a41eea67552cba40dc6fd43
* | | | | am b56f10aa: am 32c308a5: Merge "If media wants ASCII lowercasing, it needs ↵Elliott Hughes2013-08-022-4/+5
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | to ask for it." * commit 'b56f10aa66914aeb880c624ed6e938e1941ff820': If media wants ASCII lowercasing, it needs to ask for it.
| * | | If media wants ASCII lowercasing, it needs to ask for it.Elliott Hughes2013-08-022-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption, and use toLowerCase(Locale.getDefault()) if you want the user's locale's casing rules for human consumption. Bug: https://code.google.com/p/android/issues/detail?id=58359 Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
* | | | Remove whitespace in IAudioService.aidlJean-Michel Trivi2013-08-011-10/+10
| | | | | | | | | | | | | | | | Change-Id: I537a2ad8356b04fec25bd7a5a8934f0bc343c1f6
* | | | Remove outdated comment in MediaFocusControlJean-Michel Trivi2013-08-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stream type is used in audio focus to better deal with RemoteControlClient/Display in the case of notifications during media playback. This comment is therefore outdated. Change-Id: Ifa33bc4c0fbf065d8288ff5fdfaf1bc67b2a337e
* | | | Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVEJean-Michel Trivi2013-08-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE Update android.media.AudioManager.requestAudioFocus() javadoc for the new focus type. Bug 8251963 Change-Id: I7cd69faaf5f0169ee462b91d0aaa75dc6b092107
* | | | Notification muting conditional to exclusive audio focus requestJean-Michel Trivi2013-07-315-15/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary of feature: Do not mute notifications when speech recognition recording is active, but when an app has requested audio focus with AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE. Implementation: Move definition of AUDIOFOCUS_NONE to AudioManager where other audio focus codes are defined. Add support for querying the current audio focus type. When audio focus is requested as GAIN_TRANSIENT_EXCLUSIVE, make the corresponding loss by LOSS_TRANSIENT. Before playing a notification, check whether GAIN_TRANSIENT_EXCLUSIVE has been requested. Bug 8251963 Change-Id: I41edc77326b70639d2fdcb4642c53109995b72a8
* | | | Focus gain sends focus loss through the focus stackJean-Michel Trivi2013-07-302-26/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a new focus owner lands on the stack, don't just make the previous top of the stack lose focus, propagate the loss throughout the stack. Only dispatch focus loss on focus loss state change Remove canDispatchFocus() method as it now doesn't need to be known (and shouldn't be known) outside of the implementation. Fix error where the focus code for a focus gain request should always be a focus loss code. Bug 8315302 Change-Id: I92c8f51fdcc090851d34d00fefed916e25da40c1
* | | | Focus loss value takes into account previous lossJean-Michel Trivi2013-07-301-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement a state machine to represent how to transition to the next audio focus loss state, given the current focus loss (state) and the given external focus gain (transition). Bug 8315302 Change-Id: I4a3d5a4a53c842caceaa876206a993c4e5446681
* | | | Merge "Audio focus request managed by FocusRequester class"Jean-Michel Trivi2013-07-302-165/+245
|\ \ \ \
| * | | | Audio focus request managed by FocusRequester classJean-Michel Trivi2013-07-302-165/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all audio focus request functionality under a new class/file. Clean up encapsulation of data related to the request. Change-Id: I989796e1ee1a5fc99799a64e1612294e0e40fa6d
* | | | | Merge "Camera2 API: Rename package to android.hardware.camera2"Eino-Ville Talvala2013-07-302-3/+3
|\ \ \ \ \
| * | | | | Camera2 API: Rename package to android.hardware.camera2Eino-Ville Talvala2013-07-302-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
* | | | | | Merge "More refactor of audio focus, keep track of focus loss"Jean-Michel Trivi2013-07-301-40/+56
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | More refactor of audio focus, keep track of focus lossJean-Michel Trivi2013-07-291-40/+56
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Move more audio focus-specific functionality into the class representing each audio focus owner, FocusStackEntry. Keep track of how each FocusStackEntry instance lost focus. Change-Id: I35df0717765a26ec747cb0110e2e951d155d1525
* | | | am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT ↵Marco Nelissen2013-07-301-1/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | is used with decoders as well" * commit '51cf3661fa658d7cec6a08ed3f916ce98203027c': MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
| * | | Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"Marco Nelissen2013-07-301-1/+2
| |\ \ \
| | * | | MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as wellMartin Storsjo2013-07-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If reading the decoded pixel data (instead of letting the system render it), this is critical for interpreting the data correctly. The video MediaCodec CTS tests use this MediaFormat key in this way as well. Therefore, make sure the documentation reflects the actual use of this field - claiming that it is encoder-only is misleading. Change-Id: I9bfd295a95dd3e7d1fa3189886fd243b07bb82cc
* | | | | am 00157c0d: am 6c0fe0df: Merge "MediaFormat: Fix the documentation link to ↵Jean-Baptiste Queru2013-07-291-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | the AAC profile constants" * commit '00157c0d466786e7f125f58257ff706e132c52ef': MediaFormat: Fix the documentation link to the AAC profile constants
| * | | Merge "MediaFormat: Fix the documentation link to the AAC profile constants"Jean-Baptiste Queru2013-07-291-1/+1
| |\ \ \
| | * | | MediaFormat: Fix the documentation link to the AAC profile constantsMartin Storsjo2013-07-251-1/+1
| | |/ / | | | | | | | | | | | | Change-Id: If1780436baa2884cea05ccd8ab74745af790eb17
* | | | Merge "Select BT route when currently selected route becomes unavailable"Chong Zhang2013-07-261-1/+7
|\ \ \ \
| * | | | Select BT route when currently selected route becomes unavailableChong Zhang2013-07-261-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10003524 Change-Id: I5de740fac9f2bc2a56125296defe892a8deb505e
* | | | | am 77802977: am 161b3624: Merge "Fix NullpointerException in ↵Marco Nelissen2013-07-261-0/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | MediaMetadataRetriever" * commit '778029776bac60856af7e97e19deb7b1f42b1984': Fix NullpointerException in MediaMetadataRetriever
| * | | | Fix NullpointerException in MediaMetadataRetrieverOscar Rydhé2013-07-261-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the API documentation and the ICS implementation the setDataSource(String) method throws an IllegalArgumentException if path is null. In JB a NullpointerException is thrown instead. This fix restores the earlier behaviour. Change-Id: Ic47baadf91076acc227d92d84f6b8d1d6ecd0c03
| * | | am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager ↵Oliver Woodman2013-07-023-0/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and AudioTrack." into jb-mr2-dev * commit '9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0': Expose latency methods through AudioManager and AudioTrack.
| | * | | Expose latency methods through AudioManager and AudioTrack.Oliver Woodman2013-07-013-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a longer term plan to fix audio/video sync, but this gets the Java level to parity with the native level, and allows applications in Java to achieve sync in the same way as the native media player. APIs are left as hidden for now. Bug: 9587132 Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
* | | | | Merge "More info in audio focus stack entry"Jean-Michel Trivi2013-07-241-14/+55
|\ \ \ \ \
| * | | | | More info in audio focus stack entryJean-Michel Trivi2013-07-241-14/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fields in an audio focus stack entry to track what type of audio focus was requested, and why it was lost. Make audio focus dump easier to read. Change-Id: I61f6e43c13a32328a07125a2ba0dce1053872c86
* | | | | | Rename mChannels to mChannelMask to avoid ambiguityGlenn Kasten2013-07-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This clarifies that it's a channel mask, as opposed to a count. Also no need to initialize the field in the declaration, as it's initialized in the constructor. Include channel mask in error logs. Change-Id: Ifc02668cf922dc8826a9fb042b3ca52fad377ba6
* | | | | | Match AudioRecord.getChannelConfiguration docsGlenn Kasten2013-07-241-8/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 10001767 Change-Id: I28705ae84ee585afc37cdd2b13a039b7bfc36543
* | | | | Merge "Use the utility logging methods and single tag"Glenn Kasten2013-07-231-6/+5
|\ \ \ \ \
| * | | | | Use the utility logging methods and single tagGlenn Kasten2013-07-221-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See Change-Id: I5bfc66562a4a0630d520390ae886bd19de3327cb Change-Id: I569e0a746c4430f9d0cd1cb20bbc9aa50b81bcfc
* | | | | | Merge "Launch voice-based searches as current user"Jean-Michel Trivi2013-07-231-1/+3
|\ \ \ \ \ \
| * | | | | | Launch voice-based searches as current userJean-Michel Trivi2013-07-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Launch the voice-based interactions (voice search, web search) as the current user. Change-Id: I5a038feea24346c3c94f86097f574ffdc499cf60
* | | | | | | Merge "Fix dump formatting of RemoteControlClient playback state dump"Jean-Michel Trivi2013-07-231-4/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix dump formatting of RemoteControlClient playback state dumpJean-Michel Trivi2013-07-221-4/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take into account the two types of undefined plyback position. Only use "ms" unit when there is a position to write. Fix misplaced ",". Change-Id: I5033ec6ee7480f1ac525af7b7b0a9da259614783
* | | | | | | Merge "Detect integer overflow"Glenn Kasten2013-07-231-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Detect integer overflowGlenn Kasten2013-07-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See Change-Id: Iec36fc0ea67095e18a2c238b148dad5545c102c1 Change-Id: I421f0d84c64310fcb6c5451993cfaf38125c4bb2
* | | | | | | Merge "Verify that AudioRecord object is initialized for more APIs"Glenn Kasten2013-07-231-0/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Verify that AudioRecord object is initialized for more APIsGlenn Kasten2013-07-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compare to AudioTrack, which already has these checks. Change-Id: I3a239dfb4b918ceabfb723f189cc50ed6662eee6
* | | | | | | Merge "Remove redundant AudioRecord. qualifiers"Glenn Kasten2013-07-231-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove redundant AudioRecord. qualifiersGlenn Kasten2013-07-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbols of the current class don't need to be qualified. See Change-Id: Ic89ce568771165d01d4b5bcf835c591ca0b86541 Change-Id: I75ec74a95cf68bf8eabdbac5b227a9035b945360
* | | | | | | Merge "Return the record state locked"Glenn Kasten2013-07-231-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Return the record state lockedGlenn Kasten2013-07-221-1/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This field is always accessed with a lock held. See Change-Id: I502b7401196c42932c9667ef73eb4cae16c3da16 Change-Id: I0900b60cd6b9076868532f951db370ccd5a0312e
* | | | | Refactor for audio focus, remote control, media button handlingJean-Michel Trivi2013-07-225-2292/+2571
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract audio focus, remote control and media button handling outside of AudioService without any changes in functionality. Moving logic to new class, MediaFocusControl. Introduce interface for managing volum control logic, VolumeController. The VolumePanel class implements this interface. Change-Id: I72bda2e0670c26e61ff076fd729c15f9f1156dc5
* | | | | Merge "Inform AudioFlinger of device's low RAM attribute"Glenn Kasten2013-07-222-0/+15
|\ \ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.1 at 2025-02-13 15:27:09 +0000