2110 Commits

Author SHA1 Message Date
Jean-Michel Trivi
fec4a907b1 Merge "Audio focus request managed by FocusRequester class" 2013-07-30 18:54:48 +00:00
Eino-Ville Talvala
92ed645159 Merge "Camera2 API: Rename package to android.hardware.camera2" 2013-07-30 18:42:20 +00:00
Eino-Ville Talvala
2f1a2e423e Camera2 API: Rename package to android.hardware.camera2
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
2013-07-30 11:37:31 -07:00
Jean-Michel Trivi
783cea4658 Merge "More refactor of audio focus, keep track of focus loss" 2013-07-30 18:31:13 +00:00
Jean-Michel Trivi
83283f23eb Audio focus request managed by FocusRequester class
Move all audio focus request functionality under a new class/file.
Clean up encapsulation of data related to the request.

Change-Id: I989796e1ee1a5fc99799a64e1612294e0e40fa6d
2013-07-30 11:27:08 -07:00
Marco Nelissen
4d4a137bf5 am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
* commit '51cf3661fa658d7cec6a08ed3f916ce98203027c':
  MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
2013-07-30 10:28:38 -07:00
Marco Nelissen
f38b528701 Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well" 2013-07-30 17:11:55 +00:00
Jean-Michel Trivi
00bf4b1817 More refactor of audio focus, keep track of focus loss
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
2013-07-29 18:15:29 -07:00
Jean-Baptiste Queru
0350f4167f am 00157c0d: am 6c0fe0df: Merge "MediaFormat: Fix the documentation link to the AAC profile constants"
* commit '00157c0d466786e7f125f58257ff706e132c52ef':
  MediaFormat: Fix the documentation link to the AAC profile constants
2013-07-29 16:40:21 -07:00
Jean-Baptiste Queru
6c0fe0df4e Merge "MediaFormat: Fix the documentation link to the AAC profile constants" 2013-07-29 23:03:00 +00:00
Chong Zhang
d7c05c2ca9 Merge "Select BT route when currently selected route becomes unavailable" 2013-07-26 23:46:46 +00:00
Chong Zhang
2e5fbf5521 Select BT route when currently selected route becomes unavailable
Bug: 10003524
Change-Id: I5de740fac9f2bc2a56125296defe892a8deb505e
2013-07-26 15:36:37 -07:00
Marco Nelissen
3f44fae1dd am 77802977: am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"
* commit '778029776bac60856af7e97e19deb7b1f42b1984':
  Fix NullpointerException in MediaMetadataRetriever
2013-07-26 14:55:00 -07:00
Oscar Rydhé
425916e4c5 Fix NullpointerException in MediaMetadataRetriever
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
2013-07-26 18:18:17 +00:00
Martin Storsjo
816af56eac MediaFormat: Fix the documentation link to the AAC profile constants
Change-Id: If1780436baa2884cea05ccd8ab74745af790eb17
2013-07-25 12:53:46 +03:00
Martin Storsjo
158754b1bf MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
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
2013-07-25 10:52:54 +03:00
Jean-Michel Trivi
2e01220647 Merge "More info in audio focus stack entry" 2013-07-24 22:35:30 +00:00
Jean-Michel Trivi
caa2c5bba8 More info in audio focus stack entry
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
2013-07-24 14:52:57 -07:00
Glenn Kasten
33c437df39 Rename mChannels to mChannelMask to avoid ambiguity
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
2013-07-24 12:20:52 -07:00
Glenn Kasten
d5af238199 Match AudioRecord.getChannelConfiguration docs
Bug: 10001767
Change-Id: I28705ae84ee585afc37cdd2b13a039b7bfc36543
2013-07-24 11:43:32 -07:00
Glenn Kasten
369dbf9a66 Merge "Use the utility logging methods and single tag" 2013-07-23 16:26:01 +00:00
Jean-Michel Trivi
2352228ff1 Merge "Launch voice-based searches as current user" 2013-07-23 16:20:26 +00:00
Jean-Michel Trivi
9020316ea3 Merge "Fix dump formatting of RemoteControlClient playback state dump" 2013-07-23 16:18:58 +00:00
Glenn Kasten
4afca0cc90 Merge "Detect integer overflow" 2013-07-23 15:52:31 +00:00
Glenn Kasten
4e693f558f Merge "Verify that AudioRecord object is initialized for more APIs" 2013-07-23 15:22:39 +00:00
Glenn Kasten
7fc7230787 Merge "Remove redundant AudioRecord. qualifiers" 2013-07-23 15:03:14 +00:00
Glenn Kasten
004f2b7835 Merge "Return the record state locked" 2013-07-23 14:51:30 +00:00
Jean-Michel Trivi
f47634edfe Fix dump formatting of RemoteControlClient playback state dump
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
2013-07-22 17:47:11 -07:00
Jean-Michel Trivi
dcd40c0e57 Launch voice-based searches as current user
Launch the voice-based interactions (voice search, web search) as
 the current user.

Change-Id: I5a038feea24346c3c94f86097f574ffdc499cf60
2013-07-22 16:46:42 -07:00
Jean-Michel Trivi
fa9a69805b Refactor for audio focus, remote control, media button handling
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
2013-07-22 16:09:15 -07:00
Glenn Kasten
626c0415a2 Use the utility logging methods and single tag
See Change-Id: I5bfc66562a4a0630d520390ae886bd19de3327cb

Change-Id: I569e0a746c4430f9d0cd1cb20bbc9aa50b81bcfc
2013-07-22 10:07:03 -07:00
Glenn Kasten
6ab188589d Detect integer overflow
See Change-Id: Iec36fc0ea67095e18a2c238b148dad5545c102c1

Change-Id: I421f0d84c64310fcb6c5451993cfaf38125c4bb2
2013-07-22 10:01:16 -07:00
Glenn Kasten
70c17f4703 Merge "Inform AudioFlinger of device's low RAM attribute" 2013-07-22 15:02:29 +00:00
Glenn Kasten
8057f24d4a Verify that AudioRecord object is initialized for more APIs
Compare to AudioTrack, which already has these checks.

Change-Id: I3a239dfb4b918ceabfb723f189cc50ed6662eee6
2013-07-22 07:40:41 -07:00
Glenn Kasten
25a64b4bad Remove redundant AudioRecord. qualifiers
Symbols of the current class don't need to be qualified.
See Change-Id: Ic89ce568771165d01d4b5bcf835c591ca0b86541

Change-Id: I75ec74a95cf68bf8eabdbac5b227a9035b945360
2013-07-22 07:40:23 -07:00
Glenn Kasten
79e49a0752 Return the record state locked
This field is always accessed with a lock held.
See Change-Id: I502b7401196c42932c9667ef73eb4cae16c3da16

Change-Id: I0900b60cd6b9076868532f951db370ccd5a0312e
2013-07-22 07:40:09 -07:00
Justin Koh
cacfe69b68 Add FX_KEYPRESS_INVALID constant to AudioManager.
Add FX_KEYPRESS_INVALID constant to AudioManager. This is a sound which should
play if the user tries to click or press on an element which is disabled.

Change-Id: Idd8953abeddd1afb51f7f190f9fb612ef672defa
2013-07-18 10:46:19 -07:00
Glenn Kasten
fd116ad1ab Inform AudioFlinger of device's low RAM attribute
to help it configure it's memory

Bug: 9798886
Change-Id: Ia2df59cfcb76f5ff48cca92b107915e2adde899c
2013-07-18 10:03:27 -07:00
Jaekyun Seok
bfdad8ecad Add a keycode to switch audio tracks (1/2)
A key to switch audio tracks is general on media devices like blu-ray.

Bug: 9728155
Change-Id: Ib61822b8aa9c143a8febc3cff4707fa775119448
2013-07-12 17:23:29 +09:00
Oliver Woodman
dae9aa3f37 am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev
* commit '9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0':
  Expose latency methods through AudioManager and AudioTrack.
2013-07-02 01:33:56 -07:00
Oliver Woodman
e64716ad01 Expose latency methods through AudioManager and AudioTrack.
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
2013-07-01 22:30:18 +01:00
Oliver Woodman
86bebb4c78 Merge "Expose latency methods through AudioManager and AudioTrack." 2013-06-27 10:40:08 +00:00
Zhijun He
212e78df9e ImageReader: Implementation of ImageReader and Image APIs
Used for direct image data access from producer like camera or video decoder.

Bug: 9254294
Change-Id: I1853af03f4487ac3585d86202f6140854471fa89
2013-06-26 15:56:27 -07:00
Oliver Woodman
61dcdf3764 Expose latency methods through AudioManager and AudioTrack.
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.

Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
2013-06-26 16:33:54 +01:00
hkuang
63a6473a56 Change the comments to incorporate change for VP9 decoder.
Change-Id: I9a4f3af9278c90962856516df5930e8924c28f9d
2013-06-26 00:35:41 +00:00
Chong Zhang
e0dae4b493 Merge "MediaRouter: grey out wifi displays that's in use" 2013-06-15 00:36:15 +00:00
Scott Main
343233c4ed am 3717cf6b: am 07d6d9e7: Merge "additional documentation for media codec info" into jb-mr2-dev
* commit '3717cf6bc2e92d58d8de9f039165d1e6c73de8a0':
  additional documentation for media codec info
2013-06-14 17:11:53 -07:00
Scott Main
3717cf6bc2 am 07d6d9e7: Merge "additional documentation for media codec info" into jb-mr2-dev
* commit '07d6d9e74c1f79de791b37b1cb738fa398915879':
  additional documentation for media codec info
2013-06-14 17:08:33 -07:00
Scott Main
c06bb7f5b9 additional documentation for media codec info
Change-Id: I3b4e5baccab6da2dfc8dff8d03872bb5b346a4ad
2013-06-14 11:56:15 -07:00
Marco Nelissen
2d2cd32cc7 Make MediaPlayer.invoke() public-and-hidden again
It's used in a bunch of other places in other repos that I don't
want to touch.

Change-Id: I6f2ec6f8066286de9b52499fc71f3f08953c3cb4
2013-06-14 09:47:27 -07:00