summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Public API for peak and RMS monitoring through the Visualizer effectJean-Michel Trivi2013-09-231-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Public API to extend the capabilities of the Visualizer audio effect with measurements of peak and RMS values. Bug 8413913 Change-Id: Ifc6646e013ec55fde3523fab685add1d043f1272
* | | | | Merge "Add audio level monitoring capabilities in Visualizer effect" into ↵Jean-Michel Trivi2013-09-232-0/+182
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | klp-dev
| * | | | | Add audio level monitoring capabilities in Visualizer effectJean-Michel Trivi2013-09-232-0/+182
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the visualizer audio effect with the capability to query peak and RMS values for the currently playing audio. Values are expressed in mB and are retrieved as an array of int values in the native layer, and written directly as object fields for the JNI. Bug 8413913 Change-Id: I808075a18e61f85c566544a2bdaae10e5c4a644b
* | | | | camera2: Rename CameraProperties to CameraCharacteristicsIgor Murashkin2013-09-211-2/+2
|/ / / / | | | | | | | | | | | | | | | | Bug: 10360518 Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
* | | | Merge "Public API for RemoteController" into klp-devJean-Michel Trivi2013-09-193-174/+173
|\ \ \ \
| * | | | Public API for RemoteControllerJean-Michel Trivi2013-09-183-174/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Public API, under system|signature permission for access to currently playing metadata and playback state. Public API for sending media key events. Bug 8209392 Change-Id: I39b9309ca3fb1bc305492bad98740df0ae0842b2
* | | | | Merge "ImageReader: disable NV21 support" into klp-devZhijun He2013-09-182-4/+15
|\ \ \ \ \
| * | | | | ImageReader: disable NV21 supportZhijun He2013-09-182-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10787131 Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
* | | | | | Merge "Misc. media API changes" into klp-devLajos Molnar2013-09-182-10/+13
|\ \ \ \ \ \
| * | | | | | Misc. media API changesLajos Molnar2013-09-172-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - MediaCodec.setParameter signature to take android.os.Bundle - PARAMETER_KEY_VIDEO_BITRATE value - comments for MediaFormat.KEY_LANGUAGE and createSubtitleFormat Change-Id: I092e9830cb21df08b331854cbd28c758db06bc10 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10461617
* | | | | | | Merge "Add CaptioningManager listener Subtitle support." into klp-devLajos Molnar2013-09-184-64/+206
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add CaptioningManager listener Subtitle support.Lajos Molnar2013-09-174-64/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update default track selection based on settings change. Implement HLS track selection scheme. This requires synchronization for subtitletrack and controller. Change-Id: I8295956d264ab2016a83957ace37d9d7b1acde4c Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | | | | | | Merge "Fix ImageReader onImageAvailable synchronization" into klp-devJesse Hall2013-09-181-19/+49
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix ImageReader onImageAvailable synchronizationJesse Hall2013-09-171-19/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a race where close() can return while there are still onImageAvailable callbacks pending. Bug: 10666923 Change-Id: Ic519b68f3132ceb7f95a9a42ebd1032c1638fbf5
* | | | | | | Fix javadoc in RemoteControlClient and MediaMetadataEditorJean-Michel Trivi2013-09-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd333d9cb47e74c4ca1d8ec7bd950224d81783b0
* | | | | | | RemoteController class to expose IRemoteControlDisplay featuresJean-Michel Trivi2013-09-187-33/+905
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap all the features of IRemoteControlDisplay.aidl in a new class, RemoteController, that implements the IRemoteControlDisplay interface. The API functions to expose in the SDK are tagged with "CANDIDATE FOR API" Bug 8209392 Change-Id: I597bcd503ac93e73889c9ae8b47b16c4fcb363bc
* | | | | | | Adjust absolute volume only when the device is streaming musicMatthew Xie2013-09-173-60/+51
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The device has to be A2DP device Remove AudioManager#avrcpUpdateVolume bug 10681804 Change-Id: I2bc85e48fdff374638b984af593c6f1c4ddd3ee6
* | | | | | Merge "Revise new public API for ratings in RemoteControlClient" into klp-devJean-Michel Trivi2013-09-176-230/+788
|\ \ \ \ \ \
| * | | | | | Revise new public API for ratings in RemoteControlClientJean-Michel Trivi2013-09-176-230/+788
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor RemoteControlClient.MetadataEditor to move functionality in new abstract class MediaMetadataEditor, so it can be also used on the "display" side of the RemoteControl functionality. Compatibility of these changes has been tested against existing Play applications which use the RemoteControlClient API. Move the new constants and method definitions related to the ratings feature to MediaMetadataEditor. This changes the yet-to-be-published ratings API, so this doesn't break compatibility. Rating feature is handled by the new Rating class with a set of constructors that handle the different rating models. Bug 8440498 Change-Id: I9b6dc2204bfc48594bad5cd6449d357f8a485da0
* | | | | | | Merge "Public API for LoudnessEnhancer audio effect" into klp-devJean-Michel Trivi2013-09-171-12/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Public API for LoudnessEnhancer audio effectJean-Michel Trivi2013-09-161-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follows the API style of the other audio effects Bug 8413913 Change-Id: I1ee21b0af7d9fc565d9cdacd006684577eeb7b21
* | | | | | | Merge "ImageReader: fix the 0 crop rect size issue" into klp-devZhijun He2013-09-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | ImageReader: fix the 0 crop rect size issueZhijun He2013-09-161-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rect isValid actually include the zero size case, which we don't want to include in our case. This causes camera ImageReader test case fails at buffer size sanity check. Bug: 9802344 Change-Id: I561f5a049c6117c613df1e1b2789c43af9a19628
* | | | | | Merge "Loudness enhancer audio effect" into klp-devJean-Michel Trivi2013-09-172-0/+310
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Loudness enhancer audio effectJean-Michel Trivi2013-09-162-0/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LoudnessEnhancer as android.media.AudioEffect subclass Define UUID for loudness enhancer effect Bug 8413913 Change-Id: If0ae6023f77ccf3aafbb55f2b3135b2ea1bb8365
* | | | | | Merge "Fix media stress test." into klp-devYu Shan Emily Lau2013-09-161-5/+9
|\ \ \ \ \ \
| * | | | | | Fix media stress test.Yu Shan Emily Lau2013-09-161-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Fix the CamcorderProifle initalization. 2) Insert 2 seconds after camera release. Change-Id: Ib22f1922a917233f3d1020dc67de834e00fd0959
* | | | | | | Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into ↵Igor Murashkin2013-09-164-140/+134
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | klp-dev
| * | | | | | media: Update ImageReader to remove MaxImagesAcquiredExceptionIgor Murashkin2013-09-134-140/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * acquiring images now throws IllegalStateException instead of MaxImagesAcquiredException Bug: 10691447 Change-Id: I7ce68f990fb96703705b9181012a28633fea0b7a
* | | | | | | Merge "media: Update ImageReader APIs" into klp-devIgor Murashkin2013-09-165-97/+524
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | media: Update ImageReader APIsIgor Murashkin2013-09-125-97/+524
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10461757 Change-Id: Ic04e4c41965e3d417b29004f3f08e0cd56b8f4cb
* | | | | | | Merge "Miscellaneous fixes to SoundPool unit test" into klp-devGlenn Kasten2013-09-162-19/+32
|\ \ \ \ \ \ \
| * | | | | | | Miscellaneous fixes to SoundPool unit testGlenn Kasten2013-09-132-19/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly specify API level 8, to permit same .apk be used with multiple platform versions. In the priority test, use different samples for low and priority sounds, so it is possible to hear the difference. Increase sleep times to make it easier to hear. Only use Log.e for errors. Add more logs and sleeps. Pan more slowly. Fix typos in logs about the test names. Fix typo in pan comment. Change-Id: Iebce07ca0cf3d6fa1b04faa8577faa1c6d25f8e6
* | | | | | | | Merge "Stress test for AudioTrack shared memory bug" into klp-devGlenn Kasten2013-09-163-0/+264
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Stress test for AudioTrack shared memory bugEric Laurent2013-09-113-0/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in patch set 2: - add call to ProcessState::self()->startThreadPool() - remove dead code AudioSystem::get_audio_flinger - use simpler MemoryDealer isntead of MemoryHeapBase - AudioTrack now must be sp<> instead of raw pointer - use new constants from audio.h - change LOGx macros to ALOGx - fix file permission on Android.mk Bug: 2801375 Change-Id: I899b08e0aa91deca328523f66f71e667011b4522
* | | | | | | | ImageReader: get correct crop sizeZhijun He2013-09-161-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10752797 Change-Id: I2e56d69cde7f5ca669a366646b876861b277a239
* | | | | | | | Merge "Part of corrections from KLP API Review: Media" into klp-devJeff Tinker2013-09-141-0/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Part of corrections from KLP API Review: MediaJeff Tinker2013-09-131-0/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/10461617 Change-Id: Ic2e102c39428f7cef2923d00a67aec8c77cd108e
* | | | | | | MediaFormat: add getInteger with default value convenience methodLajos Molnar2013-09-121-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58947a2f4a286fef74f74cb189469278056d4759 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | | | | | | Fix CalledFromWrongThreadException in MediaPlayer's subtitle supportLajos Molnar2013-09-121-3/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call selectTrack/setSubtitleWidget only from MP's looper or the applications's event thread, which is the same for now (we only support subtitles in VideoView.) Change-Id: Ic1de923b801f28657f37e0330b95c321931a6960 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10691837 Bug: 10326117
* | | | | | Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-devLajos Molnar2013-09-121-0/+24
|\ \ \ \ \ \
| * | | | | | MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHTLajos Molnar2013-09-061-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KEY_MAX_WIDTH and KEY_MAX_HEIGHT are optional video decoder format keys. Specify both to request seamless resolution- change support from video decoders that support this feature. You can check this via CodecCapabilities.isFeatureSupported. The codecs use the MAX_WIDTH/HEIGHT values as hints for the range of resolutions that needs to be supported. Note, however, that some codecs may require more memory just by _preparing_ for larger maximum resolutions, whether or not that resolution is actually used. Change-Id: I00fe986ef894fec4bb39bceed081da0e88725d59 Signed-off-by: Lajos Molnar <lajos@google.com> Related-to-bug: 7093648
* | | | | | | Merge "Add HOTWORD as an AudioSource" into klp-devEric Laurent2013-09-123-11/+15
|\ \ \ \ \ \ \
| * | | | | | | Add HOTWORD as an AudioSourceEric Laurent2013-09-103-11/+15
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This is a low-priority source that can be preempted by others - This is required for scenarios where someone wants an alway-on graceful microphone Bug: 10640877. Change-Id: Idb3577541103717cb713a7a93d3762ad2c2f4710
* | | | | | | Merge changes Ia6300c23,Idd2ae8ad into klp-devEino-Ville Talvala2013-09-123-119/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Camera2: Immutable metadata Camera2: Listener rework and other API updates
| * | | | | | | Camera2: Immutable metadataEino-Ville Talvala2013-09-113-119/+49
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all camera metadata immutable once created; requests are created using CameraRequest.Builder. - Separate CameraMetadata implementation from interface - Implement deep copying of metadata - Requests/results/properties have-a native implementation Bug: 10360518 Change-Id: Ia6300c237219d39f70c63156fa9ca666d951a36e
* | | | | | | Merge "Remove dependency on JNIHelp header side effects." into klp-devRuben Brunk2013-09-1211-0/+23
|\ \ \ \ \ \ \
| * | | | | | | Remove dependency on JNIHelp header side effects.Ruben Brunk2013-09-1011-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10680559 Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
* | | | | | | | Merge "Pass subtitle track properties to SubtitleController" into klp-devChong Zhang2013-09-112-4/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass subtitle track properties to SubtitleControllerChong Zhang2013-09-112-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10326117 Change-Id: I387406adf3e1bd835b031dd5fbd2e1cdeaf2fe87