OSDN Git Service
Christopher Ferris [Wed, 11 Jun 2014 19:20:18 +0000 (12:20 -0700)]
resolved conflicts for merge of
281b884c to master
Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef
Chong Zhang [Wed, 11 Jun 2014 18:26:07 +0000 (18:26 +0000)]
Merge "Log an error when audio/video encoder failed to create"
Mark Salyzyn [Wed, 11 Jun 2014 18:18:54 +0000 (18:18 +0000)]
am
dd80baf5: am
1f15b117: Merge "libcamera_client: 64-bit compile issue"
* commit '
dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1':
libcamera_client: 64-bit compile issue
Chong Zhang [Wed, 11 Jun 2014 17:27:28 +0000 (10:27 -0700)]
Log an error when audio/video encoder failed to create
Change-Id: I493981cddeb9452c533e2917d8c440897d5e6b49
related-to-bug:
15106730
Ruben Brunk [Wed, 11 Jun 2014 17:03:20 +0000 (17:03 +0000)]
am
42092d70: (-s ours) Merge "DO NOT MERGE: camera2: Disallow connectDevice for all old HALs." into lmp-preview-dev
* commit '
42092d7015b078a09c36de107d924fc8139ccf50':
DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.
Yin-Chia Yeh [Wed, 11 Jun 2014 17:03:13 +0000 (17:03 +0000)]
am
3416f9ac: Merge "Camera2: Add null check to createStream" into lmp-preview-dev
* commit '
3416f9ac471f97e9544ee821a97a101cbdd25b11':
Camera2: Add null check to createStream
Wei Jia [Wed, 11 Jun 2014 17:02:47 +0000 (17:02 +0000)]
am
8756d415: Merge "Added paused state to NuPlayerDecoder" into lmp-preview-dev
* commit '
8756d415b6c31ec72caf912910248fa7ab709d25':
Added paused state to NuPlayerDecoder
Marco Nelissen [Wed, 11 Jun 2014 17:02:40 +0000 (17:02 +0000)]
am
d7e8d9a7: Guard against malformed files
* commit '
d7e8d9a7393b5429f8f13a6794b9b04d37390fb5':
Guard against malformed files
Ruben Brunk [Wed, 11 Jun 2014 00:09:41 +0000 (00:09 +0000)]
Merge "DO NOT MERGE: camera2: Disallow connectDevice for all old HALs." into lmp-preview-dev
Yin-Chia Yeh [Wed, 11 Jun 2014 00:04:28 +0000 (00:04 +0000)]
Merge "Camera2: Add null check to createStream" into lmp-preview-dev
Yin-Chia Yeh [Tue, 10 Jun 2014 23:05:44 +0000 (16:05 -0700)]
Camera2: Add null check to createStream
Prevent a native null dereference crash.
bug:
15332257
Change-Id: I10c4053a0b4f07fbf52c37dd2f2853b501def669
Wei Jia [Tue, 10 Jun 2014 23:07:46 +0000 (23:07 +0000)]
Merge "Added paused state to NuPlayerDecoder" into lmp-preview-dev
Eric Laurent [Tue, 10 Jun 2014 22:48:36 +0000 (22:48 +0000)]
Merge "audio policy: use factory to create audio policy manager"
Marco Nelissen [Thu, 5 Jun 2014 17:37:26 +0000 (10:37 -0700)]
Guard against malformed files
b/
15433074
Change-Id: I35363def42d38eba49dd5aece566fd345743937e
Ruben Brunk [Tue, 10 Jun 2014 19:56:42 +0000 (12:56 -0700)]
DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.
(preview only)
Bug:
15515564
Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710
Eric Laurent [Tue, 10 Jun 2014 03:01:29 +0000 (20:01 -0700)]
audio policy: use factory to create audio policy manager
Use the class factory to create the audio policy mamager
instead of AudioPolicyManager class constructor and
use a pointer to an AudioPolicyInterface.
Change-Id: Ibb5a8eee5d597db67cf13f279c909181cfee9949
Wei Jia [Wed, 4 Jun 2014 23:21:56 +0000 (16:21 -0700)]
Added paused state to NuPlayerDecoder
This prevents decoder from requesting new buffer until the decoder
is resumed, and prevents processing a potential DISCONTINUITY while
the player is still flushing.
Bug:
13133027
Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0
(cherry picked from commit
704e72658b1082264a26a83c50046da34f07d1a1)
Adam Lesinski [Tue, 10 Jun 2014 18:41:50 +0000 (18:41 +0000)]
am
4299a7c2: am
940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '
4299a7c2b049b07b3456a81a4c2b1030523c08ca':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Marco Nelissen [Tue, 10 Jun 2014 17:47:16 +0000 (17:47 +0000)]
Merge "Remove unneeded code"
Marco Nelissen [Fri, 6 Jun 2014 21:36:23 +0000 (14:36 -0700)]
Remove unneeded code
Change-Id: I33c7424f1858e9f3f7f7ab5fb46db09c2714e02e
Eric Laurent [Tue, 10 Jun 2014 17:22:13 +0000 (17:22 +0000)]
am
d8754e07: (-s ours) DO NOT MERGE - AudioFlinger: increase per client memory pool
* commit '
d8754e07e23eecb68068c0c392aeb0428c529e4e':
DO NOT MERGE - AudioFlinger: increase per client memory pool
Christopher Ferris [Tue, 10 Jun 2014 03:11:18 +0000 (03:11 +0000)]
am
d3af4265: Merge "Link libcrypto for MD5_* functions."
* commit '
d3af4265dca4c8ebcead5376f1c73a5dafc34778':
Link libcrypto for MD5_* functions.
Christopher Ferris [Tue, 10 Jun 2014 03:03:50 +0000 (03:03 +0000)]
Merge "Link libcrypto for MD5_* functions."
Christopher Ferris [Tue, 10 Jun 2014 02:35:17 +0000 (19:35 -0700)]
Link libcrypto for MD5_* functions.
Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
Eric Laurent [Tue, 10 Jun 2014 02:18:54 +0000 (02:18 +0000)]
Merge "sound trigger: stop recognition on sound model unload"
Eric Laurent [Tue, 10 Jun 2014 00:31:51 +0000 (17:31 -0700)]
DO NOT MERGE - AudioFlinger: increase per client memory pool
Temporary workaround for issue
14057166 allowing
AudioTracks from a given client to use up to 4MB
of shared memory.
Bug:
14057166.
Change-Id: I19adb8d424ed170df61c1cd706be3d10788edfc1
Mark Salyzyn [Mon, 9 Jun 2014 23:34:58 +0000 (16:34 -0700)]
libcamera_client: 64-bit compile issue (part deux)
- %p print warning message
- size_t print warning messages
- unused parameter warning messages
Change-Id: I5de3564b27c65fe1a27c0bcc18ac1b72fca040e2
Mark Salyzyn [Mon, 9 Jun 2014 23:41:55 +0000 (23:41 +0000)]
am
1f15b117: Merge "libcamera_client: 64-bit compile issue"
* commit '
1f15b117db93c664de935be7a369878a5bc78bb9':
libcamera_client: 64-bit compile issue
Mark Salyzyn [Mon, 9 Jun 2014 23:36:17 +0000 (23:36 +0000)]
Merge "libcamera_client: 64-bit compile issue"
Mark Salyzyn [Mon, 9 Jun 2014 23:28:21 +0000 (16:28 -0700)]
libcamera_client: 64-bit compile issue
- size_t print format
- some unused parameter warning messages
Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528
Eric Laurent [Mon, 9 Jun 2014 23:20:05 +0000 (16:20 -0700)]
sound trigger: stop recognition on sound model unload
Force a stop recognition command to the HAL when
unloading a sound model and recognition is still active.
Change-Id: I7379a64a37bbc3eeea08e0e1d59e427de9544a10
Adam Lesinski [Mon, 9 Jun 2014 21:12:44 +0000 (21:12 +0000)]
am
940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '
940f8be3619cecda66dad33f995904795df88c2d':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Andy Hung [Mon, 9 Jun 2014 17:57:29 +0000 (17:57 +0000)]
Merge "Add tests directory for AudioFlinger"
Eric Laurent [Sun, 8 Jun 2014 21:14:17 +0000 (14:14 -0700)]
audio policy service: fix potential deadlock in destructor
In the AudioCommandThread loop, release mLock before releasing
the strong reference on the service as AudioPolicyService destructor
calls AudioCommandThread::exit() which acquires mLock.
Also check exiPending in thread loop before processing pending
commands or sleeping.
Bug:
15449050.
Change-Id: I148bf21bd67ef721b5b5ee2c1a6afb185c59daa3
Eric Laurent [Sat, 7 Jun 2014 10:01:16 +0000 (10:01 +0000)]
am
318cd78e: Merge "audio policy: added audio HAL version in audio_policy.conf" into lmp-preview-dev
* commit '
318cd78e3b8503113919191b3711eb8be5d23d35':
audio policy: added audio HAL version in audio_policy.conf
Lajos Molnar [Sat, 7 Jun 2014 03:05:27 +0000 (20:05 -0700)]
add back HEVC SoftOMX decoder
Bug:
14571712
Change-Id: Iea399e0cfec1f78584c74089f01821d8552ced40
Lajos Molnar [Sat, 7 Jun 2014 00:11:02 +0000 (17:11 -0700)]
Remove SoftOMX HEVC decoder
Bug:
14571712
Change-Id: Ie3fb3743ec27a0cfdea612052ba15a06f2c891db
Eric Laurent [Sat, 7 Jun 2014 00:01:42 +0000 (00:01 +0000)]
Merge "audio policy: added audio HAL version in audio_policy.conf" into lmp-preview-dev
Lajos Molnar [Fri, 6 Jun 2014 23:03:30 +0000 (23:03 +0000)]
am
8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev
* commit '
8a45461198c69e9e15f133c2e11ded47fc4c708b':
stagefright: added support, and SoftOMX decoder, for HEVC
Eric Laurent [Fri, 6 Jun 2014 21:56:52 +0000 (14:56 -0700)]
audio policy: added audio HAL version in audio_policy.conf
Each hardware module section in audio_policy.conf indicates
the audio HAL version it implements.
Also added a template audio_policy.conf file with examples
of device and gain descriptors added for audio HAL version3.0.
Bug:
14815883.
Change-Id: Id219d121f81f687363f6c18f2d1684b2448dcdf4
Lajos Molnar [Fri, 6 Jun 2014 22:59:08 +0000 (22:59 +0000)]
Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev
Harish Mahendrakar [Tue, 20 May 2014 16:30:59 +0000 (09:30 -0700)]
stagefright: added support, and SoftOMX decoder, for HEVC
also fixed QuerySupportedProfileLevels in
SoftVideoDecoderOMXComponent.cpp
Bug:
14571712
Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777
Marco Nelissen [Fri, 6 Jun 2014 21:37:32 +0000 (21:37 +0000)]
Merge "Guard against malformed files"
Chong Zhang [Fri, 6 Jun 2014 21:34:32 +0000 (21:34 +0000)]
Merge "do not drop TS packet on discontinuity at payload start"
Adam Lesinski [Fri, 6 Jun 2014 21:13:00 +0000 (21:13 +0000)]
Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
Adam Lesinski [Wed, 4 Jun 2014 22:14:03 +0000 (15:14 -0700)]
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Change-Id: Ib06f429102a51c540c8132f3397130328279e03a
Chong Zhang [Thu, 5 Jun 2014 21:44:03 +0000 (14:44 -0700)]
do not drop TS packet on discontinuity at payload start
Bug:
15470543
Change-Id: Ia96a295fbc7e9f1b1d5c0d9091ac62184d44dcfa
Chong Zhang [Fri, 6 Jun 2014 20:22:17 +0000 (20:22 +0000)]
Merge "check camera permission for video source other than SURFACE"
Chong Zhang [Thu, 5 Jun 2014 19:03:56 +0000 (12:03 -0700)]
check camera permission for video source other than SURFACE
Bug:
15448704
Change-Id: I5f5417037b877a6da3a46700ebb5a80ea59aac36
Marco Nelissen [Thu, 5 Jun 2014 17:37:26 +0000 (10:37 -0700)]
Guard against malformed files
b/
15433074
Change-Id: I35363def42d38eba49dd5aece566fd345743937e
Jean-Michel Trivi [Fri, 6 Jun 2014 17:57:44 +0000 (17:57 +0000)]
Merge "Audio policy: new media volume curve for speaker with DRC"
Marco Nelissen [Fri, 6 Jun 2014 16:51:00 +0000 (16:51 +0000)]
Merge "Make AAC decoder behavior after flush consistent with non-flush"
Marco Nelissen [Thu, 5 Jun 2014 23:58:57 +0000 (16:58 -0700)]
Make AAC decoder behavior after flush consistent with non-flush
Timestamps don't start at zero, but at least they're consistent.
Change-Id: I2ce9cd60655a4ece787802902b679fda01cb6182
Marco Nelissen [Thu, 5 Jun 2014 23:41:06 +0000 (23:41 +0000)]
am
270facca: We still need the raw codec
* commit '
270facca297275a4889d1cc49ec4d2768ed38bb7':
We still need the raw codec
Eric Laurent [Thu, 5 Jun 2014 23:41:06 +0000 (23:41 +0000)]
am
45df31f5: Merge "AudioFlinger: fix PatchPanel debug log." into lmp-preview-dev
* commit '
45df31f511ba9ae9b45c769fc546eca4bcf4bbdb':
AudioFlinger: fix PatchPanel debug log.
Marco Nelissen [Thu, 5 Jun 2014 22:52:54 +0000 (15:52 -0700)]
We still need the raw codec
It's used for FLAC and PCM Wav, which output PCM data.
b/
15320804
Change-Id: I67921a45dd4a3a175fce412e055728859e2309ba
Jean-Michel Trivi [Thu, 5 Jun 2014 22:33:20 +0000 (15:33 -0700)]
Audio policy: new media volume curve for speaker with DRC
For devices with DRC on speaker (using the flag "speaker_drc_enabled"
in audio_policy.conf), set the speaker media volume to use a
new curve with more aggressive attenuation in the upper range.
Bug
15318604
Change-Id: Ia5fb9fdd608fddad22fadfb1065d35574030bb52
Wei Jia [Thu, 5 Jun 2014 20:00:28 +0000 (20:00 +0000)]
Merge "Added paused state to NuPlayerDecoder"
Glenn Kasten [Thu, 5 Jun 2014 17:41:38 +0000 (10:41 -0700)]
resolved conflicts for merge of
1a392aa1 to master
Change-Id: I7658a265a12f2a19a32ed187502a50aadafdba82
Eric Laurent [Thu, 5 Jun 2014 17:26:30 +0000 (17:26 +0000)]
Merge "AudioFlinger: fix PatchPanel debug log." into lmp-preview-dev
Wei Jia [Wed, 4 Jun 2014 23:21:56 +0000 (16:21 -0700)]
Added paused state to NuPlayerDecoder
This prevents decoder from requesting new buffer until the decoder
is resumed, and prevents processing a potential DISCONTINUITY while
the player is still flushing.
Bug:
13133027
Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0
Eric Laurent [Thu, 5 Jun 2014 15:32:53 +0000 (15:32 +0000)]
Merge "add sound trigger native service"
Lajos Molnar [Thu, 5 Jun 2014 14:47:00 +0000 (14:47 +0000)]
am
9042b116: Merge "MediaCodecList: remove force-added codecs for videoeditor" into lmp-preview-dev
* commit '
9042b116b62a287bb86a18af6b428c7a2b7720aa':
MediaCodecList: remove force-added codecs for videoeditor
Glenn Kasten [Thu, 5 Jun 2014 14:44:32 +0000 (14:44 +0000)]
Merge "Squashed commit of the following:" into lmp-preview-dev
Lajos Molnar [Thu, 5 Jun 2014 14:43:01 +0000 (14:43 +0000)]
am
cb3d3a36: (-s ours) am
17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
* commit '
cb3d3a365c91ed996c47dea6ff1490f2f13c1b52':
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Lajos Molnar [Thu, 5 Jun 2014 14:39:59 +0000 (14:39 +0000)]
am
17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
* commit '
17a6dd60f5f8a28af1db451bcbf44805648c844a':
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Ruben Brunk [Thu, 5 Jun 2014 14:39:24 +0000 (14:39 +0000)]
am
cc839bd4: Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-dev
* commit '
cc839bd4727be02d9352f46d043a7e9cc9c7d642':
DNG: Fix OpcodeList2 length field.
Lajos Molnar [Thu, 5 Jun 2014 14:36:18 +0000 (14:36 +0000)]
Merge "MediaCodecList: remove force-added codecs for videoeditor" into lmp-preview-dev
Glenn Kasten [Thu, 5 Jun 2014 03:31:46 +0000 (20:31 -0700)]
Squashed commit of the following:
commit
9128d6ffec43731d723f9b394f243d940f4c7e41
Author: Glenn Kasten <gkasten@google.com>
Date: Tue May 13 10:38:42 2014 -0700
Use of fast capture by normal capture
Will only configure fast capture path if the input buffer size is less than
10 ms and the input sample rate is same as the primary output sample rate.
Change-Id: I4a7cdc6069d750845412c626d27e83f72a1ab397
commit
2e5e0806a5abe7499848358ef5fde5c26405000d
Author: Glenn Kasten <gkasten@google.com>
Date: Mon Jun 2 08:29:22 2014 -0700
Add mPrimaryOutputSampleRate
Change-Id: I46b527fc3f2b5a5720a74b4f0b9a8f2e0d570b09
commit
baf1d73467923996d1b1f2a9237260cc5697e050
Author: Andy Hung <hunga@google.com>
Date: Fri May 30 10:42:03 2014 -0700
Change parameter type for volume to float in AudioMixer
Change-Id: I4da1505ce852505f86f8e5b87f60e8edceeb30e0
commit
40fe20fa9760cd03c69778c2021cf7a490d75ece
Author: Andy Hung <hunga@google.com>
Date: Fri May 30 10:35:47 2014 -0700
Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer
Change-Id: Ic040311305026f0b4c4280a5b3bef7a447ac1da3
commit
37c9a2b49f876abc5ff537a9ec036d7f0a423775
Author: Andy Hung <hunga@google.com>
Date: Thu May 29 21:33:13 2014 -0700
Refactor setVolumeRampVariables in AudioMixer
Change-Id: I8fcf3101bcea292de7c65433fa578f1c9cdd0974
commit
397070eca31f121d5d3993de1bfea99aaea5d4f3
Author: Andy Hung <hunga@google.com>
Date: Thu May 29 18:52:38 2014 -0700
Fix floating point output from mixer
A buffer pointer was being erroneously reset to buffer start,
potentially causing an audio glitch. The floating point
output mode is not enabled at this time, but will be in
the future.
Change-Id: If8b6414d232f064f3a2e2c5a6da889a91b27fb24
commit
2e61aa5b33b2247bbc5d4eaa0b519df9accd4bbc
Author: Andy Hung <hunga@google.com>
Date: Fri May 23 21:22:17 2014 -0700
Add multiple format capability to FastMixer
Floating point data from MixerThread into FastMixer.
Multiple output format capability from FastMixer to Sink.
Change-Id: I0da17810ee71381a39a006c46faec71108d22c26
commit
b9ea653c702a785bbd23a66c5e588d40b4192c4e
Author: Andy Hung <hunga@google.com>
Date: Thu May 29 15:53:09 2014 -0700
Avoid resetting BufferProviders in mixer unnecessarily
Change-Id: Iad85c4dfd21be1dbf89dc11906106b34219376f8
commit
7f1a6d6da21c616f80cf9ba21bea11b419ec561b
Author: Andy Hung <hunga@google.com>
Date: Tue May 27 12:32:17 2014 -0700
Update dynamic resampler buffer fetching
Make the criteria tight for fetching to avoid storing
excessive frame data internal to the resampler.
This should reduce jitter in frame delivery computation.
Bug:
14962343
Change-Id: I7adaf714d11c272696ccdbf218bda994c7217477
commit
b5e4aac07b9a02f0c803c090058602b03ac09ebb
Author: Glenn Kasten <gkasten@google.com>
Date: Tue May 27 12:30:54 2014 -0700
Allow kFastTrackMultiplier to be specified per device
Change-Id: I4eaaaf038df720cec4f5d9221d1b632970f9e3dd
commit
b93cd97a52af31122df2da2cc0415cda888c8c73
Author: Andy Hung <hunga@google.com>
Date: Fri May 23 21:13:31 2014 -0700
Rename mixBuffer to mMixerBuffer in FastMixer
Likewise mixBufferState becomes mMixerBufferState.
This harmonizes with the naming in AF::MixerThread.
Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122
commit
8340758622b9711365a8801806cbdf934803c63f
Author: Andy Hung <hunga@google.com>
Date: Mon May 12 16:51:41 2014 -0700
Add multiple format capability to AudioMixer
Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc
Signed-off-by: Andy Hung <hunga@google.com>
commit
6b695b9d094820c232a897a3fabbe83d2b7193fe
Author: Glenn Kasten <gkasten@google.com>
Date: Thu Mar 13 14:59:31 2014 -0700
Start adding FastCapture based on FastThread WIP
This version supports at most one fast capture client.
Change-Id: Idf609bfc80ae22433433d66a5232c043c65506df
commit
e951ad05a2c388471d7e2806d91e7d51325a150a
Author: Glenn Kasten <gkasten@google.com>
Date: Mon May 12 11:06:26 2014 -0700
Move validation of frameCount from set to openRecord_l
This move is needed because frameCount is validated on server side for
fast tracks (as should be done for normal tracks too).
Change-Id: I6d99e80869fd90fab373cf60ef348c01f075fbca
commit
73e76992dbba794894837c38e5472312ea829cf3
Author: Glenn Kasten <gkasten@google.com>
Date: Tue May 13 10:41:52 2014 -0700
Allow track buffer "allocation" to be from pipe
Change-Id: Ib9ac170f8e8b7746b3588157a56cbee3b753a1cb
commit
60de1d7ded05c6304037d4858b401094b1d2b4d3
Author: Andy Hung <hunga@google.com>
Date: Fri May 9 15:02:21 2014 -0700
Add format parameter to getTrackName() and track_t
Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e
Signed-off-by: Andy Hung <hunga@google.com>
Change-Id: Ied0ade8b25d23e89bb03319a7e3135c238f735b9
Eric Laurent [Thu, 5 Jun 2014 03:02:57 +0000 (20:02 -0700)]
AudioFlinger: fix PatchPanel debug log.
Bug:
14815883.
Change-Id: I71cf2ef74a96d3cdb27f2beb1b76b8979c738335
Andy Hung [Thu, 5 Jun 2014 02:17:39 +0000 (02:17 +0000)]
Merge "Update resampler to fetch exactly the frames needed"
Eric Laurent [Wed, 4 Jun 2014 23:42:59 +0000 (23:42 +0000)]
am
26594add: Merge "audio policy: new setAudioPortConfig implementation" into lmp-preview-dev
* commit '
26594add1ec0b6255c96b39e43ccdc95b2c480aa':
audio policy: new setAudioPortConfig implementation
Ruben Brunk [Wed, 4 Jun 2014 23:33:00 +0000 (23:33 +0000)]
Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-dev
Ruben Brunk [Wed, 4 Jun 2014 22:35:21 +0000 (15:35 -0700)]
DNG: Fix OpcodeList2 length field.
Bug:
15432434
Change-Id: I2a0e017f72c31cdbd30df1fdb32cdd5ff4af3649
Eric Laurent [Sat, 19 Apr 2014 00:40:41 +0000 (17:40 -0700)]
add sound trigger native service
Change-Id: I0cd954c1c7d28a334e786d0004431d4f6a1227ec
Eric Laurent [Wed, 4 Jun 2014 21:31:53 +0000 (21:31 +0000)]
am
4bd9d452: Merge "audio policy: removed raw pointers." into lmp-preview-dev
* commit '
4bd9d45230cd69c0409591874db3e6f2e3a226b3':
audio policy: removed raw pointers.
Eric Laurent [Wed, 4 Jun 2014 21:31:52 +0000 (21:31 +0000)]
am
83438ce6: Merge "audio policy: add permission for routing APIs." into lmp-preview-dev
* commit '
83438ce6cbbff49ca26d4bd694ffdad4842ded5a':
audio policy: add permission for routing APIs.
Marco Nelissen [Wed, 4 Jun 2014 21:31:52 +0000 (21:31 +0000)]
am
0d843fdc: (-s ours) Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-dev
* commit '
0d843fdc91c98d447c3c3e357020d07b783c7bc0':
Fix typos, remove callback functions - do not merge
Ruben Brunk [Wed, 4 Jun 2014 21:31:52 +0000 (21:31 +0000)]
am
61378ccb: Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-dev
* commit '
61378ccba48bb826988cdc585b264fdd999e1e6a':
DNG: Add additional TIFF/EP tag definitions.
Ruben Brunk [Tue, 3 Jun 2014 05:57:26 +0000 (22:57 -0700)]
DNG: Add additional TIFF/EP tag definitions.
Bug:
15112503
Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
Eric Laurent [Wed, 4 Jun 2014 19:22:29 +0000 (19:22 +0000)]
Merge "audio policy: new setAudioPortConfig implementation" into lmp-preview-dev
Eric Laurent [Wed, 4 Jun 2014 18:11:30 +0000 (18:11 +0000)]
Merge "audio policy: removed raw pointers." into lmp-preview-dev
Eric Laurent [Wed, 4 Jun 2014 18:11:10 +0000 (18:11 +0000)]
Merge "audio policy: add permission for routing APIs." into lmp-preview-dev
Eric Laurent [Tue, 3 Jun 2014 20:32:54 +0000 (13:32 -0700)]
audio policy: new setAudioPortConfig implementation
Rewrite setAudioPortConfig() to take advantage of the new
AudioPortConfig class.
The configuration is now checked against AudioPort capabilities
and stored in the AudioPortConfig.
Fix a bug where the config mask was not set properly when calling
setAudioPortConfig at the PatchPanel interface.
Remove debug log in IAudioPolicyService.
Bug:
14815883.
Change-Id: I7eb7683a96e049581c13f2a212486507883d008d
Eric Laurent [Mon, 2 Jun 2014 19:01:23 +0000 (12:01 -0700)]
audio policy: removed raw pointers.
Use only RefBase objects for the following classes:
- AudioOutputDescriptor
- AudioInputDescriptor
- HwModule
- EffectDescriptor
Create a common base class AudioPortConfig for:
AudioOutputDescriptor, AudioInputDescriptor and DeviceDescriptor
Bug:
14815883.
Change-Id: I1bd193ef1020780d8b94c13142029903615aba97
Marco Nelissen [Wed, 4 Jun 2014 00:27:02 +0000 (00:27 +0000)]
Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-dev
Marco Nelissen [Mon, 2 Jun 2014 22:40:15 +0000 (15:40 -0700)]
Fix typos, remove callback functions - do not merge
b/
15414091
Change-Id: I2f7b7ea6a7943a808de2c6a54fe810eefdee133e
Ruben Brunk [Tue, 3 Jun 2014 23:39:06 +0000 (23:39 +0000)]
Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-dev
Andy Hung [Tue, 3 Jun 2014 01:54:08 +0000 (18:54 -0700)]
Update resampler to fetch exactly the frames needed
This avoids unnecessary overfetching/releasing, which
could cause problems with the upstream AudioBufferProvider.
A one input sample delay is placed on the stream compared
with the previous implementation.
This change only affects the Dynamic resampler.
Change-Id: Ic7fcff130e0081b4724cfb5a00dc8e8b4a8b1af3
Narayan Kamath [Tue, 3 Jun 2014 11:11:38 +0000 (11:11 +0000)]
am
b6af7c63: am
05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"
* commit '
b6af7c635113d288d16a4f549679beffd86822d8':
Mp3decoder: Remove unused arm assembly files
Narayan Kamath [Tue, 3 Jun 2014 08:56:40 +0000 (08:56 +0000)]
am
05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"
* commit '
05eaf105a2a1445c2c13801ee4533ded47f1df1b':
Mp3decoder: Remove unused arm assembly files
Narayan Kamath [Tue, 3 Jun 2014 08:35:10 +0000 (08:35 +0000)]
Merge "Mp3decoder: Remove unused arm assembly files"
Ruben Brunk [Tue, 3 Jun 2014 05:57:26 +0000 (22:57 -0700)]
DNG: Add additional TIFF/EP tag definitions.
Bug:
15112503
Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
Andy Hung [Mon, 2 Jun 2014 23:56:45 +0000 (23:56 +0000)]
Merge "Change parameter type for volume to float in AudioMixer"
Andy Hung [Mon, 2 Jun 2014 23:32:27 +0000 (23:32 +0000)]
Merge "Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer"
Glenn Kasten [Mon, 2 Jun 2014 22:53:59 +0000 (22:53 +0000)]
Merge "Use of fast capture by normal capture"
Andy Hung [Mon, 2 Jun 2014 22:36:47 +0000 (22:36 +0000)]
Merge "Refactor setVolumeRampVariables in AudioMixer"
Glenn Kasten [Tue, 13 May 2014 17:38:42 +0000 (10:38 -0700)]
Use of fast capture by normal capture
Will only configure fast capture path if the input buffer size is less than
10 ms and the input sample rate is same as the primary output sample rate.
Change-Id: I4a7cdc6069d750845412c626d27e83f72a1ab397
Glenn Kasten [Mon, 2 Jun 2014 15:29:22 +0000 (08:29 -0700)]
Add mPrimaryOutputSampleRate
Change-Id: I46b527fc3f2b5a5720a74b4f0b9a8f2e0d570b09
Eric Laurent [Thu, 29 May 2014 21:37:38 +0000 (14:37 -0700)]
audio policy: add permission for routing APIs.
Add check for signature or system permission
"android.permission.MODIFY_AUDIO_ROUTING" for routing
APIs.
Bug:
14815883.
Change-Id: Iefa0b9d90127a53e03a2e6d50dc93d8f4ae63e2f