OSDN Git Service
Glenn Kasten [Thu, 3 Jul 2014 17:20:00 +0000 (10:20 -0700)]
Improve dumpsys for capture threads
Show per-track sample rate, and whether there is a fast capture thread
Change-Id: If6a08a40d1eeba0690aa8da3c541f845ec101b7f
Jungshik Jang [Tue, 15 Jul 2014 10:38:42 +0000 (19:38 +0900)]
Revisit HDMI-CEC system audio mode in AudioService.
From recent feedback on HDMI-CEC system audio mode,
it would be unnecessary to enforce output from AudioService.
Instead, it would follow audio policy according to status
of HDMI-CEC system audio mode.
For that removed two params of setHdmiSystemAudioModeSupported
api of AudioManager.
In terms of speaker mute, it will be handled by removing speaker
from audio ouput instead of changing gain control. For that
added new force usage type, FOR_HDMI_SYSTEM_AUDIO_MODE and
new force config type, FORCE_HDMI_SYSTEM_AUDIO_ENFORCED.
This is used to notify change of system audio mode to
audio policy manager.
Bug:
16305986
Bug:
16002150
Change-Id: I702e0f9ce7c7887d5f5dd02b06a40d20e4c950df
Lajos Molnar [Thu, 17 Jul 2014 00:15:21 +0000 (00:15 +0000)]
Merge "M3UParser: check for NULL before setting meta data" into lmp-dev
Robert Shih [Wed, 16 Jul 2014 22:27:43 +0000 (15:27 -0700)]
M3UParser: check for NULL before setting meta data
Bug:
16351654
Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772
Robert Shih [Thu, 12 Jun 2014 21:49:23 +0000 (14:49 -0700)]
GenericSource: implement getTrackCount/getTrackInfo
Bug:
15153976
Change-Id: I0204c4188d485cda026497469c7cde24f7bd5c95
Glenn Kasten [Wed, 16 Jul 2014 19:37:20 +0000 (19:37 +0000)]
Merge "Add audio_input_flags_t to HAL open_input_stream" into lmp-dev
Lajos Molnar [Mon, 14 Jul 2014 16:35:25 +0000 (09:35 -0700)]
Fix M3UParser relative path handling.
Bug:
16017037
Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
Eric Laurent [Fri, 11 Jul 2014 16:14:45 +0000 (09:14 -0700)]
sound trigger: added permission checks
Add check for android.permission.CAPTURE_AUDIO_HOTWORD
to all sound trigger binder calls on server side.
Bug:
12378680.
Change-Id: Ic3fd70e947882cdf5f4d4a4fe609a2c5a8236fd5
Lajos Molnar [Tue, 15 Jul 2014 14:56:04 +0000 (07:56 -0700)]
stagefright: add MediaCodec.reset()
Bug:
12034929
Change-Id: I326f1356df89474aa088c1c87f8505b33654139d
Glenn Kasten [Tue, 15 Jul 2014 22:34:27 +0000 (15:34 -0700)]
Add audio_input_flags_t to HAL open_input_stream
For backward compatibility, until flags are added to openInput(),
we will assume that the request is for a low latency input stream.
Change-Id: I5e6f7e574418917ff1b41b0a47199203c69cb40f
Glenn Kasten [Tue, 15 Jul 2014 19:29:44 +0000 (19:29 +0000)]
Merge "const correctness on downmix and upmix" into lmp-dev
Glenn Kasten [Tue, 15 Jul 2014 00:26:36 +0000 (17:26 -0700)]
const correctness on downmix and upmix
Change-Id: I0f51470a6d58a22310ce7cda80afc55e9d6df1dc
Eric Laurent [Tue, 15 Jul 2014 17:38:16 +0000 (10:38 -0700)]
audio policy: build with USE_LEGACY_AUDIO_POLICY
Change-Id: I9def12ea689b00c0295c670c07373dacfb186799
Jean-Michel Trivi [Tue, 8 Jul 2014 23:31:40 +0000 (16:31 -0700)]
DO NOT MERGE LVM virtualizer: add support for virtualizer capability query
Change-Id: I88106ba25f9b3f8fd7616307ab6b7fbe7afb6e91
(cherry picked from commit
bfd3b9764841971be2d2f04a3fdbd41a2144beea)
Ruben Brunk [Wed, 18 Jun 2014 17:39:40 +0000 (10:39 -0700)]
camera2: Set orientation flags for hardware composer.
Bug:
15116722
Change-Id: I3fcc9aea38afcbd665f86c511a9929fe9a6a3a8f
Jesse Hall [Tue, 8 Jul 2014 02:26:31 +0000 (19:26 -0700)]
Encoder input buffers don't need HW_TEXTURE usage
Change-Id: Ibb1be86ae99439ccbce3fc2b38d92115083ef7ff
Naveen Kumar Ponnusamy [Tue, 1 Jul 2014 22:10:40 +0000 (15:10 -0700)]
Resolution reinitialization changes
Decoder initialized to 320x240. When higher resolution comes,
the decoder reinitialized to the resolution.
Bug:
14571712
Change-Id: I6b6ad17dd87f0112ce7ccf4f6c17bb4c65b5d8af
Chong Zhang [Sat, 12 Jul 2014 02:47:22 +0000 (02:47 +0000)]
Merge "MediaCodec: change onError cb to return CodecException"
Chong Zhang [Fri, 11 Jul 2014 23:17:14 +0000 (16:17 -0700)]
MediaCodec: change onError cb to return CodecException
Bug:
11990118
Change-Id: I3278aecb20df88c42fa2709a66e6166eb3cbe56f
Eric Laurent [Sat, 12 Jul 2014 02:29:16 +0000 (02:29 +0000)]
Merge "audiopolicy: remove debug log in AudioPolicyEffects.cpp"
Sreeram Ramachandran [Sat, 12 Jul 2014 00:37:32 +0000 (17:37 -0700)]
Use a better and more direct API to mark a socket as if it were a user's.
Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
Eric Laurent [Fri, 11 Jul 2014 23:51:53 +0000 (16:51 -0700)]
audiopolicy: remove debug log in AudioPolicyEffects.cpp
Change-Id: Ia037807a91d6649c3f47baccf8c107df496e934e
Chong Zhang [Wed, 9 Jul 2014 01:50:05 +0000 (18:50 -0700)]
MediaCodec async callbacks
Bug:
11990118
Change-Id: I6fe4b407d9c85cddec8d958620d5d356735273cf
Lajos Molnar [Wed, 9 Jul 2014 04:26:53 +0000 (21:26 -0700)]
stagefright: add indexed buffer and format getters to MediaCodec
These are designed to be called from the same thread as the one
calling dequeue?Buffer, and use a mutex to avoid switching
context. All other calls of MediaCodec are designed to be blocking
and synchronous.
Bug:
14297827
Change-Id: If341c6e4407ca6f10f5e0d47008dddc0e20b0a50
Eric Laurent [Fri, 11 Jul 2014 22:09:52 +0000 (22:09 +0000)]
Merge "audio policy: add rules to select audio parameters"
Eric Laurent [Wed, 9 Jul 2014 22:03:28 +0000 (15:03 -0700)]
audio policy: add rules to select audio parameters
Added rules to select most appropriate sampling rate, format and
channel mask from an input or output profile.
Moved mFlags from IOProfile to its base class AudioPort.
Removed bogus mChannelMask member in DeviceDescriptor class.
Improveed dump of dynamic parameters in AudioPort.
Change-Id: Ic09d320386002a8bafee4a28db00b1001a386678
aarti jadhav-gaikwad [Thu, 19 Jun 2014 12:13:01 +0000 (17:43 +0530)]
stagefright: Return correct play position after EOS
In case of offload getOutputPlayPositionUs_l returns
zero on reaching EOS. Return duration as position.
Bug:
15770459
Change-Id: I7aeafdc315a86ccd197d555d604e1069eead3153
Chong Zhang [Fri, 11 Jul 2014 19:17:04 +0000 (19:17 +0000)]
Merge "MediaCodec async callbacks"
aarti jadhav-gaikwad [Wed, 18 Jun 2014 09:55:26 +0000 (15:25 +0530)]
stagefright: Pass audio aac sub formats in offloadinfo
Pass audio aac sub formats in offloadinfo according to
aac profile. Audio HAL can take decision about offload
using DSP capabilities
Change-Id: If269a3654b5d2b09c183212b0646ef03e06f2d8f
Wei Jia [Fri, 11 Jul 2014 01:05:01 +0000 (01:05 +0000)]
Merge "Check meta before dereferencing it."
Wei Jia [Fri, 11 Jul 2014 00:49:27 +0000 (17:49 -0700)]
Check meta before dereferencing it.
Change-Id: Ic8153b33413a34d75a3053dbfb9530a639e0ec12
Andy Hung [Fri, 11 Jul 2014 00:11:02 +0000 (00:11 +0000)]
Merge "Return negotiated format with HAL in AudioFlinger"
Andy Hung [Thu, 10 Jul 2014 23:56:07 +0000 (16:56 -0700)]
Return negotiated format with HAL in AudioFlinger
Fixes an issue caused by extended precision and the FastMixer
when the format to the FastMixer was returned instead of the
HAL format.
Change-Id: I2be9d55d5c87d82e46b5200b07fcdd986ebde08a
Ruben Brunk [Thu, 10 Jul 2014 23:20:10 +0000 (23:20 +0000)]
Merge "DNG: Update TiffWriter to handle thumbnails and SubIfds."
Ruben Brunk [Thu, 29 May 2014 01:42:37 +0000 (18:42 -0700)]
DNG: Update TiffWriter to handle thumbnails and SubIfds.
- Fix SubIfd handling.
- Add StripSources, convenience functions for writing image strips.
- Update Input classes to use with JNI.
- Add skip method.
- Add tag definitions for GPS tags.
- Add name string to tag definitions.
Bug:
15112503
Change-Id: I9535b21261027f6c06a041c1621de8f865a0ad32
Jungshik Jang [Tue, 8 Jul 2014 13:11:24 +0000 (22:11 +0900)]
Revamp HDMI-CEC system audio mode integration with audio service.
In previous change we use setForceUse(FORCE_MEDIA, XXX) method
in order to set specific audio output type, such as LINE, HDMI_ARC,
and SPDIF. But it turns out that it conflicts with bluetooth
a2dp which uses the same setForceUse(FORCE_MEDIA, yyy).
This change is based on several conditions.
1. When other non-speaker devices are on, prevent system audio
from turing on.
2. In order to keep track of other devices' connectivity and to
turn off system audio if other device like bluetooth or
headphone preempts current output, register OnAudioPortChangeListner
to audio manager.
3. All possible system audio outputs can be merged with other
outputs without priority.
Change-Id: Ic5ccc80f9b48fb77433c347de7969837c69e58c1
Elliott Hughes [Thu, 10 Jul 2014 00:46:33 +0000 (17:46 -0700)]
resolved conflicts for merge of
373e21cc to master
Change-Id: I91afd8f9cba04559d21e1c84e25c5c60c990165d
Elliott Hughes [Thu, 10 Jul 2014 00:16:50 +0000 (00:16 +0000)]
am
be44e0e0: am
0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."
* commit '
be44e0e0ffda04725c4864d894a7cc80bd74b5ca':
Switch frameworks/av/media/libmedia to the new icu.
Elliott Hughes [Thu, 10 Jul 2014 00:08:21 +0000 (00:08 +0000)]
am
0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."
* commit '
0bffd2e60f644c8b8650c48d320c8cc22deb8ab6':
Switch frameworks/av/media/libmedia to the new icu.
Wei Jia [Tue, 8 Jul 2014 23:37:57 +0000 (16:37 -0700)]
Add support of audio offloading for NuPlayer.
Change-Id: Ic83973339fb46a83b48382e6097925f45d200867
Lajos Molnar [Wed, 9 Jul 2014 17:01:38 +0000 (10:01 -0700)]
DO NOT MERGE: Fix build for libstagefright
Bug:
15987446
Change-Id: I6a13e1f73b067b733e2592e12ee21210d4c4d476
Elliott Hughes [Wed, 9 Jul 2014 23:55:51 +0000 (23:55 +0000)]
Merge "Switch frameworks/av/media/libmedia to the new icu."
Elliott Hughes [Wed, 9 Jul 2014 23:52:17 +0000 (16:52 -0700)]
Switch frameworks/av/media/libmedia to the new icu.
Change-Id: I45349756bac6d89b02dba082ba6d606f4c489dcf
Narayan Kamath [Wed, 9 Jul 2014 12:36:43 +0000 (12:36 +0000)]
am
1c1b5e51: am
c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"
* commit '
1c1b5e51cb1acd43984ce2e82a27e61b4943186a':
m4v_h263_enc: Use uint32_t for ULong
Narayan Kamath [Wed, 9 Jul 2014 12:22:05 +0000 (12:22 +0000)]
am
c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"
* commit '
c37eaa320437b7d65d1c3f704d7b7c61d4ccd8f1':
m4v_h263_enc: Use uint32_t for ULong
Andy Hung [Wed, 9 Jul 2014 20:35:08 +0000 (20:35 +0000)]
Merge "Add floating point volume handling to AudioMixer"
Andy Hung [Wed, 9 Jul 2014 17:47:57 +0000 (17:47 +0000)]
Merge "Enable extended precision PCM output in AudioFlinger"
Lajos Molnar [Wed, 9 Jul 2014 17:19:02 +0000 (17:19 +0000)]
am
aae3f86c: (-s ours) DO NOT MERGE: Fix build for libstagefright
* commit '
aae3f86c7c9a3bce5aab0d283343455d58b133b8':
DO NOT MERGE: Fix build for libstagefright
Jean-Michel Trivi [Wed, 9 Jul 2014 16:08:47 +0000 (16:08 +0000)]
Merge "Revise speaker volume curve for media on devices with speaker DRC"
Jean-Michel Trivi [Wed, 9 Jul 2014 15:51:34 +0000 (08:51 -0700)]
Revise speaker volume curve for media on devices with speaker DRC
Bug
15318604
Change-Id: I14b451e2d8d4439fe286dd98c45d09b9dadbb4f6
Jean-Michel Trivi [Wed, 9 Jul 2014 15:52:40 +0000 (15:52 +0000)]
Merge "Cleanup unused parameters or variable in EffectBundle"
Narayan Kamath [Wed, 9 Jul 2014 15:07:10 +0000 (15:07 +0000)]
am
782be1ec: am
1c1b5e51: am
c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"
* commit '
782be1ecf1022d4e2da714b5aebe51ab616e9975':
m4v_h263_enc: Use uint32_t for ULong
Andy Hung [Tue, 24 Jun 2014 02:07:29 +0000 (19:07 -0700)]
Add floating point volume handling to AudioMixer
Use floating point volume in AudioMixer mixing when floating
point input is used with the new mixer engine.
AudioResampler is updated to take floating point volume to match.
Both legacy integer and floating point mixer engines work.
For now, integer volume is used when the new mixer engine
runs in integer input mode, for backward compatibility with
the legacy mixer. The new mixer engine will generally run in
floating point input mode. When the legacy path is removed,
the integer volumes will be removed.
Change-Id: I79e80c292ae7c8b8bdd0aa371a1b2c3a1b618290
Andy Hung [Wed, 9 Jul 2014 01:09:40 +0000 (18:09 -0700)]
Enable extended precision PCM output in AudioFlinger
Change-Id: I7c0907c7b2369681975d8ea0192b722d7ed7a867
Jean-Michel Trivi [Tue, 8 Jul 2014 21:17:29 +0000 (14:17 -0700)]
Cleanup unused parameters or variable in EffectBundle
No unused parameter warning in EffectBundle.
Remove unused variable declaration in Virtualizer_getParameter
Change-Id: Ibe1c051bc21ac53a6c770b4aa28e31ac5d559d9b
Eino-Ville Talvala [Mon, 7 Jul 2014 22:27:58 +0000 (22:27 +0000)]
Merge "av: native_window_set_buffers_geometry is deprecated."
Pierre Couillaud [Thu, 3 Jul 2014 17:55:00 +0000 (10:55 -0700)]
av: native_window_set_buffers_geometry is deprecated.
native_window_set_buffers_geometry is deprecated, but
__set_buffers_geometry is still used for device1 camera
support.
replace deprecated call with its equivalent combination of
native_window_set_buffers_dimensions and
native_window_set_buffers_format.
Change-Id: I4940367dcae6049451508bfdfc11c16907ec1afc
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Zhijun He [Mon, 7 Jul 2014 19:44:10 +0000 (12:44 -0700)]
Camera3: only return input buffer when it is sent in request
This is to WAR the case where HAL sends non-NULL input_buffer in capture
result even capture framework doesn't send input buffer in the request.
It's very likely the input_buffer is uninitialized, and we shouldn't
use it. Log a warning for such case as well.
Bug:
16115675
Bug:
16117312
Change-Id: Ib299b45fbfe084059a9f546ded239c8094b039e2
Eric Laurent [Thu, 3 Jul 2014 23:37:08 +0000 (16:37 -0700)]
audio: deprecate audio_stream_frame_size()
Bug:
15000850.
Change-Id: I955a6efa620b8f70fa5193c7853cbe88e879c9c3
Andy Hung [Thu, 3 Jul 2014 01:12:32 +0000 (01:12 +0000)]
Merge "Add and enable multichannel for audio resampler"
Andy Hung [Thu, 10 Apr 2014 02:36:43 +0000 (19:36 -0700)]
Add and enable multichannel for audio resampler
Change-Id: I2b86fb73d70abc4c456f7567270a888086b301d4
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Thu, 10 Apr 2014 02:19:06 +0000 (19:19 -0700)]
Add multichannel to audio resample processing
Change-Id: If6bfbf74000520713f9ba19488a475fc2eefc271
Signed-off-by: Andy Hung <hunga@google.com>
Sungsoo Lim [Wed, 9 Jul 2014 14:42:18 +0000 (14:42 +0000)]
Merge "Restore the LOOPING flag in onAudioTearDownEvent"
Terry Heo [Wed, 9 Jul 2014 02:48:09 +0000 (02:48 +0000)]
Merge "audio policy: add new input audio device"
Chong Zhang [Tue, 8 Jul 2014 23:30:13 +0000 (23:30 +0000)]
Merge "HLS: do not discard packets when queuing explicit discontinuity"
Chong Zhang [Tue, 8 Jul 2014 20:52:31 +0000 (20:52 +0000)]
Merge "handle emulation_prevention_three_bytes for AVC"
Lajos Molnar [Tue, 8 Jul 2014 19:21:08 +0000 (19:21 +0000)]
Merge "AString: add startsWithIgnoreCase and endsWithIgnoreCase"
Eric Laurent [Sun, 6 Jul 2014 23:17:25 +0000 (16:17 -0700)]
sound trigger: update HAL
New start_recognition() prototype with recognition
configuration structure.
New recognition event format.
Bug:
12378680.
Change-Id: I57b430eb076e6baa58118a0ed45ce4afaacb998c
Chong Zhang [Fri, 27 Jun 2014 02:55:23 +0000 (19:55 -0700)]
handle emulation_prevention_three_bytes for AVC
bug:
15917805
Change-Id: I824fe7eea807f8faba6b149c31890b7a5df87825
Andy Hung [Tue, 8 Jul 2014 17:31:25 +0000 (17:31 +0000)]
Merge "Replace int bitDepth with audio_format_t in Resampler"
Zhijun He [Tue, 8 Jul 2014 00:05:38 +0000 (17:05 -0700)]
Camera3: Add capture intent for ZSL capture
Also fix the warning condition in input buffer return path.
Change-Id: I90e9edc1db9f1de87bc8936000b00c3306160c71
Lajos Molnar [Mon, 7 Jul 2014 22:08:24 +0000 (15:08 -0700)]
stagefright: update ACodec to use CodecBase enumerations directly
Bug:
11784825
Change-Id: I9f322b78b52bfcc5040fda951486df4354cdba4f
Lajos Molnar [Mon, 7 Jul 2014 21:55:18 +0000 (14:55 -0700)]
stagefright: update MediaCodec to use CodecBase instead of ACodec
MediaCodec still creates an ACodec instance in init()
Bug:
11784825
Change-Id: Ifba1e1582c788056c0e59afdf68cd3a504ab3679
Lajos Molnar [Mon, 7 Jul 2014 17:30:54 +0000 (10:30 -0700)]
stagefright: create CodecBase interface (abstract class)
This abstracts out the ACodec dependency in MediaCodec.
Bug:
11784825
Change-Id: I0aa8b56c6414865fd4b0646e2c5bd1b62d030682
Andy Hung [Mon, 7 Jul 2014 17:21:44 +0000 (10:21 -0700)]
Replace int bitDepth with audio_format_t in Resampler
Remove mBitDepth from class (not used).
Replace with audio_format_t in factory method to distinguish
between float and pcm 16-bit.
Change-Id: I166860796c68285077ef4458d8758d19b82523f9
Terry Heo [Fri, 27 Jun 2014 06:23:36 +0000 (15:23 +0900)]
audio policy: add new input audio device
Add entry for AUDIO_DEVICE_IN_LOOPBACK to string to enum table.
Bug:
15437484
Change-Id: I552df0969c745bdf66ff9e5d7bd864ef9e3f438d
Narayan Kamath [Wed, 9 Jul 2014 08:32:36 +0000 (08:32 +0000)]
Merge "m4v_h263_enc: Use uint32_t for ULong"
Jungshik Jang [Thu, 3 Jul 2014 00:43:47 +0000 (00:43 +0000)]
Merge "Add force usage and category for System Audio Control."
Andy Hung [Wed, 2 Jul 2014 23:13:12 +0000 (23:13 +0000)]
Merge "Add multichannel to audio resample processing"
Glenn Kasten [Mon, 7 Jul 2014 13:27:01 +0000 (13:27 +0000)]
Merge "IAudioFlinger::openRecord now suggests notificationFrames"
Glenn Kasten [Thu, 3 Jul 2014 19:23:29 +0000 (12:23 -0700)]
IAudioFlinger::openRecord now suggests notificationFrames
Change-Id: I08885cc381d03c522a23289e74f0e1ed46563863
Glenn Kasten [Thu, 3 Jul 2014 18:18:43 +0000 (11:18 -0700)]
Add new API AudioRecord::notificationFrames()
Change-Id: I27fb888f01ed547242ffaa8d4626d38c7999ad53
Glenn Kasten [Mon, 7 Jul 2014 13:07:47 +0000 (13:07 +0000)]
Merge "Add new API AudioRecord::notificationFrames()"
Glenn Kasten [Thu, 3 Jul 2014 23:37:21 +0000 (23:37 +0000)]
Merge "Remove obsolete IAudioFlinger::channelCount()"
Zhijun He [Wed, 2 Jul 2014 23:03:32 +0000 (23:03 +0000)]
Merge "Camera3: fix ZSL processor3 issues"
Zhijun He [Mon, 30 Jun 2014 17:24:11 +0000 (10:24 -0700)]
Camera3: fix ZSL processor3 issues
- Return input buffer in capture result. Per hal3.2 spec, we should return the
input buffer in process capture result rather than immediately after process
capture request.
- Make the depths of mZslQueue and mFrameList the same. It doesn't make sense
mFrameList depth is larger than mZslQueue depth.
- Set the depths of mZslQueue and mFrameList based on pipelineMaxDepth.
- Clear result queue while clearing zsl buffer queue.
- Hook up camera3 buffer listener with ZslProcessor3, make sure that adding the
same listener multiple times has no effect.
- Remove flush call in pushToReprocess, it is a guaranteed deadlock once
camera3 buffer listener is hooked up.
Change-Id: I285155ab4241e827145855d628f8e98b881c01d5
Ashok Bhat [Mon, 16 Jun 2014 16:42:02 +0000 (17:42 +0100)]
m4v_h263_enc: Use uint32_t for ULong
ULong is used in the encoder code as 32-bit unsigned integer type.
But it has been defined as an unsigned long, which will be 64-bit
on 64-bit platforms. This causes many problems including output
mismatch between 32-bit and 64-bit code and crash in certain cases.
This patch defines ULong as uint32_t. In addition, it uses uintptr_t
at places where an address is cast to an integer to check for alignment.
Change-Id: I2b0086824a5985b9fc4628ce6fbe81db156e37d2
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Robert Shih [Wed, 2 Jul 2014 17:01:59 +0000 (17:01 +0000)]
Merge "MatroskaExtractor: track specific seeking"
Jungshik Jang [Thu, 26 Jun 2014 08:23:40 +0000 (17:23 +0900)]
Add force usage and category for System Audio Control.
System Audio Control in HDMI-CEC delegate audio control
to audio receiver. When system audio control is selected
in audio settings as audio output it should select one of ARC, SPDIF,
and LINE as audio output.
Whenever user select System Audio as audio output, audio
setting should call
setForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM_AUDIO, AUDIO_POLICY_FORCE_XXX);
and if other output is selected it should call
setForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM_AUDIO, AUDIO_POLICY_FORCE_NONE);
Change-Id: I1c237ee9291a4e0acf01a86aff3176edce5c14e0
Eric Laurent [Tue, 1 Jul 2014 18:35:11 +0000 (18:35 +0000)]
Merge "frameworks: av: services: audiopolicy: Added AudioPolicyEffects"
bryant_liu [Wed, 11 Jun 2014 08:49:30 +0000 (16:49 +0800)]
frameworks: av: services: audiopolicy: Added AudioPolicyEffects
Manage pre- and postprocessing effects defined in audio_effects.conf
Change-Id: Idea1478e3d434f8ff66907adb3c77663db78d583
Edwin Wong [Tue, 1 Jul 2014 17:32:59 +0000 (10:32 -0700)]
Create a single test binary.
To run individual test suite, follow the example shown below:
adb shell LD_LIBRARY_PATH=/system/vendor/lib/mediadrm /system/bin/ClearKeyDrmUnitTest
--gtest_filter=JsonWebKeyTest.*
Change-Id: I8ecc944a734cde351505a7cd8c3997976d74553b
Edwin Wong [Tue, 1 Jul 2014 15:43:12 +0000 (08:43 -0700)]
Fix build target path.
Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
Andy Hung [Tue, 1 Jul 2014 17:35:47 +0000 (17:35 +0000)]
Merge "Add new AudioMixer processing hooks"
John "Juce" Bruce [Mon, 23 Jun 2014 19:11:56 +0000 (12:11 -0700)]
Add Unit Tests for ClearKey Plugin
Change-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3
John "Juce" Bruce [Wed, 14 May 2014 05:22:44 +0000 (22:22 -0700)]
ClearKey Implementation of DRM Plugin APIs
Adds shared-object entry points and interface implementations that
implement the Android ClearKey DRM Plugin API.
Change-Id: Ie889747492cf85efe883149833105538faaa4cfe
Edwin Wong [Fri, 16 May 2014 00:24:57 +0000 (17:24 -0700)]
JsonWebKey support.
Parses JSON Web Key Set in the response data; extracts and base64 decode
key id(s) and key(s).
bug:
12035506
Change-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e
John "Juce" Bruce [Wed, 11 Jun 2014 04:12:56 +0000 (21:12 -0700)]
Implement ClearKey Init Data Parser
Implements an object that can convert ISO-CENC or WebM initialization
data into a ClearKey license request.
Change-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e
John "Juce" Bruce [Wed, 11 Jun 2014 04:12:37 +0000 (21:12 -0700)]
Implement OpenSSL-Based Decryptor
Implements an object that does AES-CTR-128 by invoking OpenSSL.
Change-Id: I8457899ec8b69bd8f0d727029985c9580911cf99
John "Juce" Bruce [Thu, 15 May 2014 23:37:05 +0000 (16:37 -0700)]
Add ClearKey Utilities
Adds some utility functionality that is shared by multiple parts of
the ClearKey code.
Change-Id: I33a896eb68b2937918f145c9bd27174a119294b9