summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MIDI Manager changes:"Mike Lockwood2015-03-107-53/+112
|\
| * MIDI Manager changes:Mike Lockwood2015-03-097-53/+112
| | | | | | | | | | | | | | | | | | Add CloseGuard support to MidiDevice and MidiDeviceServer Make MidiDevice.close() thread safe Make non-subclassable API classes final Other misc cleanup Change-Id: I7a5d31b06b8c2403cfbc5597c5c1395f0ac90194
* | Merge "Revert "soundpool: reuse channel for same sample if available""Glenn Kasten2015-03-102-53/+34
|\ \
| * | Revert "soundpool: reuse channel for same sample if available"Glenn Kasten2015-03-092-53/+34
| | | | | | | | | | | | | | | | | | | | | This reverts commit 570576b51b8123ab05b36707ec752cf966292ca5. Bug: 19635137 Change-Id: I8385ac4c151a375c19c3606698081c947b6216e3
* | | Merge "Revert "soundpool: update sample rate when reusing audiotrack""Glenn Kasten2015-03-101-2/+0
|\ \ \ | |/ /
| * | Revert "soundpool: update sample rate when reusing audiotrack"Glenn Kasten2015-03-091-2/+0
| |/ | | | | | | | | | | | | This reverts commit a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9. Bug: 19635137 Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
* | Merge "Fix SoundPool playback of multichannel files."Andy Hung2015-03-102-5/+7
|\ \
| * | Fix SoundPool playback of multichannel files.Andy Hung2015-03-062-5/+7
| | | | | | | | | | | | | | | Bug: 17188507 Change-Id: Ia4e43c7f8889181b998673b75b1f3bbf8c43f429
* | | Merge "Add DEPTH image formats, support in ImageReader"Eino-Ville Talvala2015-03-102-34/+34
|\ \ \
| * | | Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-092-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an explicit mapping between public ImageFormat/ PixelFormat enums and internal HAL format/dataspace. - Add DEPTH16 and DEPTH_POINT_CLOUD formats - Wire up mapping layer to ImageReader to support depth formats Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
* | | | Merge "enable FM tuner and hotword capture for system apps."Eric Laurent2015-03-103-9/+13
|\ \ \ \ | |/ / / |/| | |
| * | | enable FM tuner and hotword capture for system apps.Eric Laurent2015-03-093-9/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | AudioRecord constructor with AudioAttributes and session ID as well as HOTWORD and RADIO_TUNER audio sources are now system APIs. Renamed MediaRecorder.AudioSource.FM_TUNER to MediaRecorder.AudioSource.RADIO_TUNER. Change-Id: I231c20c21e3e8cffe1837482976ebe284c9af541
* | | Camera2: Remove unused parameters in ICameraDeviceUser#createStreamEino-Ville Talvala2015-03-091-10/+6
|/ / | | | | | | | | | | - width, height, format are unused Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b
* | Merge changes Ib5cc22db,I93e0c449,I65cd4cfd,I1cef3bd4,I628c0468Mike Lockwood2015-03-0711-144/+275
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: MIDI Manager: Add explicit close mechanism for input and output ports MidiDeviceService: Add getDeviceInfo() accessor method Add MidiDevice.close() method so we can clean up our ServiceConnection Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post() to receive() Eliminate MidiPort base class for MidiInputPort and MidiOutputPort
| * | MIDI Manager: Add explicit close mechanism for input and output portsMike Lockwood2015-03-065-47/+172
| | | | | | | | | | | | | | | | | | | | | Relying on errors from closing the file descriptor is not reliable and was resulting in file descriptor leaks in device servers. Change-Id: Ib5cc22dba493eae6608a12cc6d4178d8390da77b
| * | MidiDeviceService: Add getDeviceInfo() accessor methodMike Lockwood2015-03-062-2/+14
| | | | | | | | | | | | | | | | | | so service implementations can access their own device info object. Change-Id: I93e0c449e72d76568d7b4c9f7f7db00a846b5a33
| * | Add MidiDevice.close() method so we can clean up our ServiceConnectionMike Lockwood2015-03-042-7/+29
| | | | | | | | | | | | Change-Id: I65cd4cfd940b02709daeffef6dab814305b8a6b0
| * | Make MidiSender and MidiReceiver abstract classes, rename ↵Mike Lockwood2015-03-046-42/+32
| | | | | | | | | | | | | | | | | | MidiReceiver.post() to receive() Change-Id: I1cef3bd48ca0acf2968c9de223f78445f3434404
| * | Eliminate MidiPort base class for MidiInputPort and MidiOutputPortMike Lockwood2015-03-043-59/+41
| | | | | | | | | | | | Change-Id: I628c0468ac980eee909add53a4d6e55e9b358603
* | | Merge "media: update AMessage to use handler instead of handler-id"Lajos Molnar2015-03-061-1/+1
|\ \ \
| * | | media: update AMessage to use handler instead of handler-idLajos Molnar2015-03-041-1/+1
| |/ / | | | | | | | | | | | | Bug: 19607784 Change-Id: Ia18746830816bcade510e5137bf8ce6258181ac0
* | | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
* | | Merge "Revert "Cleanup Bitmap JNI""Chad Jones2015-03-051-1/+7
|\ \ \
| * | | Revert "Cleanup Bitmap JNI"Chad Jones2015-03-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7. Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
* | | | Merge "Cleanup Bitmap JNI"John Reck2015-03-051-7/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Cleanup Bitmap JNIJohn Reck2015-03-051-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix a bunch of places where mNativeBitmap was being poked at directly, switch them either to the NDK API or to GraphicsJNI where it made sense Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
* | | Merge "MidiManager: Virtual MIDI devices are now implemented as Services"Mike Lockwood2015-03-058-262/+428
|\ \ \ | |_|/ |/| |
| * | MidiManager: Virtual MIDI devices are now implemented as ServicesMike Lockwood2015-03-048-262/+428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To implement a virtual MIDI device, include a subclass of MidiDeviceService in your application. This service is identified by an intent filter and meta-data in the application's manifest to allow the MIDI manager to register the virtual device without actually running the application. Instead, the application's MidiDeviceService subclass is started on demand when MIDI manager clients want to open the device. Here is an example of how the MidiDeviceService might be described in the application manifest: <service android:name="VirtualDeviceService"> <intent-filter> <action android:name="android.media.midi.MidiDeviceService" /> </intent-filter> <meta-data android:name="android.media.midi.MidiDeviceService" android:resource="@xml/device_info" /> </service> and the device_info.xml meta-data: <devices> <device manufacturer="Sample Manufacturer" model="Sample Model" private="false"> <input-port name="my input port" /> <output-port name="my output port" /> </device> </devices> (note that the <input-port> and <output-port> names are not currently used, but support for these will be added in a subsequent change) Client's of the virtual device will bind directly to the hosting application's MidiDeviceService subclass. To support this, MidiManager.openDevice() now returns the MidiDevice asynchronously via a callback. This change also adds a utility class called MidiDispatcher, which is a MidiReceiver that dispatches all data it receives to a list of other MidiReceivers. We now use this internally in MidiInputPort and MidiDeviceServer, but developers may use it for other purposes as well. Change-Id: Ic3009f06d56f3d5edbd87de3f0c330b51a1c217d
* | | Merge "soundpool: update sample rate when reusing audiotrack"Glenn Kasten2015-03-041-0/+2
|\ \ \
| * | | soundpool: update sample rate when reusing audiotrackDhananjay Kumar2015-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User might update playback rate while calling Play on a sample. Update sample rate if reusing existing audio track. Change-Id: I7007c335fa405baf663a322408b92b9df53efdb0 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | Merge "soundpool: reuse channel for same sample if available"Glenn Kasten2015-03-042-34/+53
|\ \ \ \ | |/ / /
| * | | soundpool: reuse channel for same sample if availableHaynes Mathew George2015-03-042-34/+53
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse channel for same sample if the channel completed current playback and is not reallocated to another sample, i.e. not stolen by other sample. authored-by: Ashish Jain <ashishj@codeaurora.org> Change-Id: Ibe7ee318c7dc11f3c4fd3a2f57d861318b10973b Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | Merge "Audio: Remove the concept of master volume."John Spurlock2015-03-044-214/+34
|\ \ \ | |/ / |/| |
| * | Audio: Remove the concept of master volume.John Spurlock2015-03-044-214/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove two config resources (use master volume, and volume ramp). - Remove master volume adjustments / getters / intents. - Retain @hidden setMasterMute, needed for device admin - Remove master volume logic in AudioService. - Remove master volume logic in VolumePanel. - Rename "getMasterStreamType" to "getUiSoundsStreamType" to avoid confusion. Bug: 19582978 Change-Id: Id02c8fa4898cff3b913147f5ac1b4038e2e7cc24
* | | MediaPlayer: add setPlaybackRate JAVA API.Wei Jia2015-03-032-0/+82
| | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I43daced7d9b53bcaca4e6a8d81ca729b32efc79f
* | | Merge "CameraManager: implement flashlight controls"Chien-Yu Chen2015-03-031-0/+5
|\ \ \ | |/ / |/| |
| * | CameraManager: implement flashlight controlsChien-Yu Chen2015-03-031-0/+5
| |/ | | | | | | | | | | | | | | Implement the flashlight controls and callbacks and update the torch mode states. Bug: 2682206 Change-Id: I59025f34f9ece75dd535166a25c428b8d68c6e4b
* | Remove unused imports in frameworks/base.John Spurlock2015-02-2831-77/+0
|/ | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* Merge "MediaRecorder: pass capture fps in float"Chong Zhang2015-02-241-4/+1
|\
| * MediaRecorder: pass capture fps in floatChong Zhang2015-02-231-4/+1
| | | | | | | | | | bug: 19460202 Change-Id: I4723c8ed44b4de399de2f3bf051b2d1a4e881910
* | Add MIDI Manager API tweaks:Mike Lockwood2015-02-2313-0/+1355
|/ | | | | | | | - Change the package name from android.midi to android.media.midi - Add option for specifying a Handler for DeviceCallback notifications Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
* Merge "ImageReader: Switch to RAW16 from RAW_SENSOR"Eino-Ville Talvala2015-02-201-3/+3
|\
| * ImageReader: Switch to RAW16 from RAW_SENSOREino-Ville Talvala2015-02-191-3/+3
| | | | | | | | Change-Id: I6362a997b0895686f988896de0463d834354f238
* | Changing AudioManager.listAudioDevicePorts to take a ↵Paul McLean2015-02-192-7/+6
| | | | | | | | | | | | ArrayList<AudioDevicePort> argument. Change-Id: Ide9a2f58a7544e263600e100ba4274403201c5fa
* | Merge "Audio Device Enumeration API."Paul McLean2015-02-192-0/+300
|\ \
| * | Audio Device Enumeration API.Paul McLean2015-02-192-0/+300
| | | | | | | | | | | | Change-Id: Ic78fda8b2a6f6ac0f37a1f665b29f3359cfc5ecc
* | | Merge "AudioAttributes: introduce new flags to bypass audio restrictions."John Spurlock2015-02-194-1/+28
|\ \ \ | |/ / |/| |
| * | AudioAttributes: introduce new flags to bypass audio restrictions.John Spurlock2015-02-184-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New @hidden @SystemApi FLAG_BYPASS_INTERRUPTION_POLICY, request to ignore any current audio restrictions, such as zen mode content-based notification filtering. - Wire up FLAG_BYPASS_INTERRUPTION_POLICY to the existing audio restriction checks in the framework. - New @hidden @SystemApi FLAG_BYPASS_MUTE, request to play audibly, even if the underlying stream is muted. - Wiring up to audio framework TBD. - Use both of these new flags on the inline volume slider controls used in Settings, ensuring playback is heard regardless of the current device filter state. Bug: 19407114 Change-Id: I3d44394931592ccbc1b61ddd9a4d1cc984da17cc
* | | Add @ResourceInt annotations on APIsTor Norbye2015-02-181-2/+3
|/ / | | | | | | Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
* | Volume: Allow dialog to query "muteable" streams.John Spurlock2015-02-172-0/+15
|/ | | | | | | | Similar to the existing ability to query streams affected by ringer mode. Bug:19260237 Change-Id: I76eb5ab6b7c7e3a4d73ac1909289c560194d4fe8
generated by cgit v1.1 at 2025-01-07 05:46:46 +0000