summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* MIDI docs: fix buffer allocationPhil Burk2015-08-191-4/+5
| | | | | | | | Also describe NoteOn more clearly. Bug: 23303608 Change-Id: I35f88022c854c2eb16ec606e58f28e06c52d18b7 Signed-off-by: Phil Burk <philburk@google.com>
* Camera2: Add camera type to getNumberOfCameras.Eino-Ville Talvala2015-08-141-1/+4
| | | | | | | | Do not list strange cameras in old API; ensure new API gets all cameras. Bug: 23194168 Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
* Camera: Fix framework bugs with DEPTH-only camera devicesEino-Ville Talvala2015-08-111-8/+20
| | | | | | | | Mostly due to no standard stream configurations being defined, and for the correct overrides for DEPTH_POINT_CLOUD format. Bug: 20537722 Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
* Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.Paul McLean2015-08-071-2/+8
| | | | | Bug: 22729461 Change-Id: Ie581c385af2be16e61fcab5993391ef42f82a7d8
* Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."Paul Mclean2015-08-071-10/+4
| | | | | | This reverts commit 8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523. Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf
* Merge "MediaSync: fix API comments." into mnc-devWei Jia2015-08-061-2/+2
|\
| * MediaSync: fix API comments.Wei Jia2015-08-061-2/+2
| | | | | | | | | | | | Bug: 23008551 Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6
* | Merge "Consider channel index masks when calculating channel counts." into ↵Paul Mclean2015-08-061-7/+20
|\ \ | | | | | | | | | mnc-dev
| * | Consider channel index masks when calculating channel counts.Paul McLean2015-08-051-7/+20
| | | | | | | | | | | | | | | Bug: 22874806 Change-Id: I04b74f5939bb81350d9e37b9629f8bbc242bffe7
* | | Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." ↵Paul Mclean2015-08-061-4/+10
|\ \ \ | |_|/ |/| | | | | into mnc-dev
| * | Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.Paul McLean2015-08-061-4/+10
| | | | | | | | | | | | | | | Bug: 22792346 Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
* | | Merge "Documenting behavior of returning a 0-length array for formats, ↵Paul Mclean2015-08-051-0/+10
|\ \ \ | | | | | | | | | | | | channels, rates queries for analog devices." into mnc-dev
| * | | Documenting behavior of returning a 0-length array for formats,Paul McLean2015-08-051-0/+10
| | |/ | |/| | | | | | | | | | | | | | | | channels, rates queries for analog devices. Bug: 22729461 Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
* | | Merge "MidiManager: use ConcurrentHashMap" into mnc-devPhil Burk2015-08-051-3/+3
|\ \ \
| * | | MidiManager: use ConcurrentHashMapPhil Burk2015-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that adding and removing device listeners is thread-safe. Bug: 22909752 Change-Id: I1369ab53c865b54e6e5eb8ea3e8d437fdd1d7197 Signed-off-by: Phil Burk <philburk@google.com>
* | | | Merge "AudioService: check for audio device connection success" into mnc-devJean-Michel Trivi2015-08-041-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | AudioService: check for audio device connection successJean-Michel Trivi2015-08-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When connecting/disconnecting and audio device, AudioService was assuming that the call was always successful through AudioSystem.setDeviceConnectionState(). In the case of the connection of a wired headset (mic + headphones), this also causes A2DP to not be used for media playback. The connection can fail if the audio device being connected is not supported by the platform. But if this failure is not taken into account for DEVICE_OUT_WIRED_HEADSET or HEADPHONES, A2DP would still be avoided even when an A2DP device reconnects at boot. The fix consists in executing the connection logic only when the connection was deemed successful. Nothing is altered on the disconnection code path, or the direct connection of A2DP. The javadoc is updated in AudioSystem to indicate the return codes to take into account in setDeviceConnectionState(). Bug 22511833 Change-Id: I22f0d2c7d4ab4fb9ee1be2f248907f721596a16f
* | | | Merge "Expand ringtone titles to support OGG and FLAC." into mnc-devJeff Sharkey2015-08-031-1/+2
|\ \ \ \
| * | | | Expand ringtone titles to support OGG and FLAC.Jeff Sharkey2015-08-031-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | These file types don't have "audio/" MIME type, so check for those MIME types explicitly. Bug: 22803550 Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a
* | | | media: Clarify MediaCodec and CodecCapabilities documentationLajos Molnar2015-07-313-38/+144
|/ / / | | | | | | | | | | | | | | | Bug: 21932760 Bug: 22847191 Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
* | | Merge "Improve getTimestamp documentation" into mnc-devGlenn Kasten2015-07-311-3/+11
|\ \ \
| * | | Improve getTimestamp documentationGlenn Kasten2015-07-301-3/+11
| | | | | | | | | | | | | | | | | | | | Bug: 18977548 Change-Id: Ia3c2620b27a173ed1a15268ca43c28e6f4e31965
* | | | Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-313-15/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Change MNC codename to just M.Dianne Hackborn2015-07-293-15/+9
| |/ / | | | | | | | | | Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
* | | Merge "media: use blocks number to find closest size" into mnc-devRonghua Wu2015-07-311-5/+10
|\ \ \
| * | | media: use blocks number to find closest sizeRonghua Wu2015-07-301-5/+10
| |/ / | | | | | | | | | | | | Bug: 22504214 Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
* | | Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-devPhil Burk2015-07-301-1/+50
|\ \ \
| * | | MIDI docs BTLE: how to open BTLE MIDI devicesPhil Burk2015-07-291-1/+50
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Adds crucial information including required permissions, MIDI UUID, and call to openBluetoothDevice(). Bug: 22606182 Change-Id: I47393bd0ecc2601906f6e50075d694c9cc17c993 Signed-off-by: Phil Burk <philburk@google.com>
* | | Merge "MIDI package doc: add hasSystemFeature() call" into mnc-devPhil Burk2015-07-301-0/+12
|\ \ \
| * | | MIDI package doc: add hasSystemFeature() callPhil Burk2015-07-291-0/+12
| |/ / | | | | | | | | | | | | | | | Bug: 22800792 Change-Id: Ib4b3e16e8167191505c31522bbccd521a9807528 Signed-off-by: Phil Burk <philburk@google.com>
* | | Merge "MidiDevice: document that opens can return nulls" into mnc-devPhil Burk2015-07-301-2/+10
|\ \ \ | |_|/ |/| |
| * | MidiDevice: document that opens can return nullsPhil Burk2015-07-291-2/+10
| |/ | | | | | | | | | | Bug: 22800792 Change-Id: I8d7ca1976e9a8abbabc011d3b2391ad7fe646f83 Signed-off-by: Phil Burk <philburk@google.com>
* | media: fix estimateFrameRatesFor to use correct ratioRonghua Wu2015-07-281-1/+1
|/ | | | | Bug: 22504214 Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
* MediaPlayer subtitle controller: use debug log instead of warningJean-Michel Trivi2015-07-231-1/+1
| | | | | | | | Don't use warning log for debug message. Bug 22698299 Change-Id: Ibe3526fffffc9a7bdcda83c02fd745325db1238b
* RingtoneManager: query results depend on caller permissionJean-Michel Trivi2015-07-221-3/+16
| | | | | | | | | | When querying for ringtones, only look for ringtones on external storage when the caller has READ_EXTERNAL_STORAGE. Document this behavior in the javadoc of the affected methods. Bug 22545684 Change-Id: Iae9c9a4ccaf635da8af2ac289b6b4df1b16c5d11
* TIF: Enable hardware acceleration on overlayJae Seo2015-07-221-4/+8
| | | | | Bug: 18162541 Change-Id: If57fb26ae88ca6ef701f01cce0e5dfd9c6eb1f0e
* Merge "Use RingtonePlayer to get ringtone title" into mnc-devTodd Kennedy2015-07-212-14/+37
|\
| * Use RingtonePlayer to get ringtone titleTodd Kennedy2015-07-202-14/+37
| | | | | | | | | | | | | | | | | | | | Instead of requiring every application that calls Rintone.getTitle() to request android.permission.READ_EXTERNAL_STORAGE, pass the call through to the system UI process. We only do this for media store URIs. Bug: 22067670 Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce
* | Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-devTerry Heo2015-07-201-1/+2
|\ \ | |/ |/|
| * TIF: Use copied track list for onTracksChanged() callbackTerry Heo2015-07-201-1/+2
| | | | | | | | | | | | | | | | In notifyTracksChanged(), the calling onTracksChanged() could be delayed. To prevent race condition on tracks, we should use the copy of tracks. Bug: 22436933 Change-Id: I0c595df9d06d5f7bda4a9f8c21a661f7aa7db71f
* | Better logging of MediaPlayer failure reason.Jeff Sharkey2015-07-201-4/+2
| | | | | | | | | | | | | | | | Otherwise exception details are dropped on the floor, making it hard to debug. Bug: 22525550 Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01
* | Merge "MediaSync: fix flush handling and deadlock" into mnc-devLajos Molnar2015-07-173-7/+51
|\ \ | |/ |/|
| * MediaSync: fix flush handling and deadlockLajos Molnar2015-07-163-7/+51
| | | | | | | | | | | | | | | | | | | | | | - clear pending video frames - flush audio track - reset clock - restart audio track after flush - don't hold lock during callback Bug: 22234976 Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856
* | TIF: Avoid generating locale dependent input IDsJae Seo2015-07-161-1/+2
|/ | | | | Bug: 22519551 Change-Id: Id818f075fa4863b6e1a6f707e0debe8f08973f25
* Merge "AudioManager: fix audio device callback list access" into mnc-devEric Laurent2015-07-151-16/+15
|\
| * AudioManager: fix audio device callback list accessEric Laurent2015-07-141-16/+15
| | | | | | | | | | Bug: 22470616. Change-Id: Ic59e8499557395dabe789b5fec9cb7c86c13d10c
* | Merge "media: Implement getAchievableFrameRatesFor with measured frame ↵Ronghua Wu2015-07-141-2/+62
|\ \ | |/ |/| | | rate." into mnc-dev
| * media: Implement getAchievableFrameRatesFor with measured frame rate.Ronghua Wu2015-07-071-2/+62
| | | | | | | | | | Bug: 20507129 Change-Id: I4751ea0f8d4f1173ace18d397b59e9cd6c70688f
* | Merge "Mute correct user from device policy manager." into mnc-devKenny Guy2015-07-092-5/+8
|\ \
| * | Mute correct user from device policy manager.Kenny Guy2015-07-082-5/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per user versions of mute methods so device policy manager can mute the correct user. Just persist change if the calling user isn't the current user. Treat calls to audio manager coming from uid 1000 as if they were coming from current user rather than user 0 so that the correct user's user restriction is checked. Bug: 21782066 Bug: 21778905 Change-Id: I51469b741096d8a2ffdc520eaf5b3fd754f2c819