OSDN Git Service
The Android Automerger [Wed, 6 Aug 2014 13:09:11 +0000 (06:09 -0700)]
merge in lmp-release history after reset to
92ce4715315bddd158c7d4028556632f0547e3b9
The Android Automerger [Tue, 5 Aug 2014 13:08:56 +0000 (06:08 -0700)]
merge in lmp-release history after reset to
d0fded31e473e909c018f534d3019fb5168bdcd6
Eric Laurent [Wed, 6 Aug 2014 00:37:58 +0000 (00:37 +0000)]
Merge "audio: fix crashes upon USB device connection" into lmp-dev
Eric Laurent [Tue, 5 Aug 2014 03:36:31 +0000 (20:36 -0700)]
audio: fix crashes upon USB device connection
- Audio policy:
Replace unknown device assertion by debug log in setDeviceConnectionState().
It is possible that some kernels indicate connection of a legacy device type
when a USB audio device is connected.
We should just ignore this device.
- Audio flinger:
Make sure FastMixer thread is idle before exiting the normal mixer thread and
closing the output stream.
Change-Id: Ia10a20176a60a8aa56765538093a555fc998508a
Yin-Chia Yeh [Wed, 6 Aug 2014 00:14:27 +0000 (00:14 +0000)]
Merge "cameraservice: disallow zsl/recording coexistentce" into lmp-dev
Eric Laurent [Wed, 30 Jul 2014 15:01:42 +0000 (10:01 -0500)]
policy manager: recognize AUDIO_DEVICE_IN_AMBIENT from policy.conf
Change-Id: If46b8d13f216bad4aa62598531d406d3303134f5
Yin-Chia Yeh [Tue, 5 Aug 2014 20:35:58 +0000 (13:35 -0700)]
cameraservice: disallow zsl/recording coexistentce
Make sure ZSL and recording stream does not exist at the same
time.
Change-Id: I19e28dedd9dd5cc5118449860b612a5c950fdaec
Wei Jia [Tue, 5 Aug 2014 21:53:08 +0000 (21:53 +0000)]
Merge "NuPlayer: don't feed decoder input data during flushing." into lmp-dev
Wei Jia [Tue, 5 Aug 2014 01:32:43 +0000 (18:32 -0700)]
NuPlayer: don't feed decoder input data during flushing.
Bug:
14955925
Bug:
16303659
Bug:
16467066
Change-Id: I7c258b986ae711357bd7e636b79853f8f3959d32
Chong Zhang [Tue, 5 Aug 2014 21:21:49 +0000 (21:21 +0000)]
Merge "set secure flag for secure file playback" into lmp-dev
Jon Eklund [Mon, 28 Jul 2014 21:06:06 +0000 (16:06 -0500)]
audio policy: support line output device
Change-Id: Iddf1b6486430270d871a45c75615e54339a818e9
Chong Zhang [Tue, 5 Aug 2014 18:58:21 +0000 (11:58 -0700)]
set secure flag for secure file playback
Bug:
16786456
Change-Id: I06f18b0e9c3f65e3e127369baa1f9ea8c9307762
Eric Laurent [Tue, 5 Aug 2014 19:54:01 +0000 (19:54 +0000)]
Merge "Add sound trigger control by audio policy" into lmp-dev
Eric Laurent [Mon, 28 Jul 2014 01:39:40 +0000 (18:39 -0700)]
Add sound trigger control by audio policy
Audio policy:
- Added active capture indication to sound trigger service:
recognition stops if concurrent capture is not supported.
- Added generation of reserved I/O handle and session ID for
utterance capture.
Sound trigger service
- Added sound model update callback handling.
- Added service state callback
- Simplified callback shared memory allocation.
Bug:
12378680.
Change-Id: Ib0292c2733e6df90fdae480633dd9953d0016ef1
aarti jadhav-gaikwad [Sat, 2 Aug 2014 10:51:32 +0000 (16:21 +0530)]
stagefright: Pass audio aac subformats 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: Ice277e8b6561b7a7db92c474f23f8041ebb35e8c
Andy Hung [Tue, 5 Aug 2014 15:33:24 +0000 (15:33 +0000)]
Merge "Remove unused TwoTrack process mode from AudioMixer" into lmp-dev
Andy Hung [Tue, 5 Aug 2014 03:43:10 +0000 (20:43 -0700)]
Remove unused TwoTrack process mode from AudioMixer
Legacy code that has not been hooked up.
Change-Id: Ic01a4eddfa1020089d5bc42f58b6a4697698c27a
Jean-Michel Trivi [Tue, 5 Aug 2014 22:44:15 +0000 (22:44 +0000)]
Merge "AAC encoder: add support for SBR mode selection" into lmp-dev
Jean-Michel Trivi [Fri, 1 Aug 2014 22:14:14 +0000 (15:14 -0700)]
AAC encoder: add support for SBR mode selection
Change-Id: Ibc07bff7710398929c135f38324dd29857fa0ea6
Phil Burk [Mon, 4 Aug 2014 23:30:51 +0000 (23:30 +0000)]
Merge "[audio][policy] fix crash when offloadInfo is NULL" into lmp-dev
Phil Burk [Mon, 4 Aug 2014 23:18:15 +0000 (16:18 -0700)]
[audio][policy] fix crash when offloadInfo is NULL
Added check for NULL pointer to avoid crash
in AudioPolicyManager when playing AC3 data.
Change-Id: Ie56788f6277be6da47d4218b1b4a6b359fce6473
Signed-off-by: Phil Burk <philburk@google.com>
Jeff Tinker [Mon, 4 Aug 2014 22:02:19 +0000 (15:02 -0700)]
Fix build break in mock drm plugin build
Change-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572
Eric Laurent [Sat, 2 Aug 2014 02:00:33 +0000 (19:00 -0700)]
audio flinger: fix service fuzz test crash
Bug:
13744704.
Change-Id: I572c89f88dcab2b8b612ec6860983306f9f159ab
The Android Automerger [Mon, 4 Aug 2014 13:08:34 +0000 (06:08 -0700)]
merge in lmp-release history after reset to
678792e362c4cd70640934049491d9f21560c63b
The Android Automerger [Sun, 3 Aug 2014 13:08:46 +0000 (06:08 -0700)]
merge in lmp-release history after reset to
facd8cf2651f7fcf7225e735cae5f5d4ef3a334e
The Android Automerger [Sat, 2 Aug 2014 13:09:32 +0000 (06:09 -0700)]
merge in lmp-release history after reset to
facd8cf2651f7fcf7225e735cae5f5d4ef3a334e
Eric Laurent [Sat, 2 Aug 2014 00:19:49 +0000 (00:19 +0000)]
Merge "Revert "Revert "sound trigger: added permission checks""" into lmp-dev
Eric Laurent [Fri, 1 Aug 2014 23:15:05 +0000 (23:15 +0000)]
Revert "Revert "sound trigger: added permission checks""
This reverts commit
936c84a5b743dce2a2572fdf54b37b187bc88b60.
Bug:
16374803.
Change-Id: I9d3137faeddf119b13f9cdb73c14ca49e1ee3d1c
Jeff Tinker [Mon, 4 Aug 2014 20:48:20 +0000 (20:48 +0000)]
Merge "Allow device to be unprovisioned" into lmp-dev
Jeff Tinker [Wed, 30 Apr 2014 17:19:03 +0000 (10:19 -0700)]
Allow device to be unprovisioned
bug:
12247651
Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
Chong Zhang [Mon, 4 Aug 2014 21:19:12 +0000 (21:19 +0000)]
Merge "MediaCodecSource: stop puller from caller's thread instead of looper" into lmp-dev
Chong Zhang [Fri, 1 Aug 2014 17:30:26 +0000 (10:30 -0700)]
MediaCodecSource: stop puller from caller's thread instead of looper
Currently CameraSource/AudioSource's stop() and read() are both called
from the puller's looper. This works if source operates normally (i.e.
read() returns regularly before source is stopped), as the stop() will
eventually be handled by the looper. However, if for some reason the
source hang, it will get stuck in read(), and the stop() will never
be processed, which could lead to ANR (in addition to the source hang).
We need to move the source's stop out of the puller's looper. It also
can't be on MediaCodecSource's looper, because the source's stop
synchrounously waits for all outstanding buffers to return, these
are only returned when MediaCodecSource's looper processes the buffer.
This change moves the stop to MediaCodecSource::stop, after encoder
is shutdown.
Bug:
16522726
Change-Id: Ie91f563c5d8a98ab091bf1945af4e51f662b9403
Eric Laurent [Sun, 3 Aug 2014 19:45:07 +0000 (19:45 +0000)]
Merge "audio policy: fix service fuzz test crash" into lmp-dev
Eric Laurent [Sat, 2 Aug 2014 00:00:54 +0000 (17:00 -0700)]
audio policy: fix service fuzz test crash
Bug:
13744391.
Change-Id: I2430e09ad00476b9ac28dc55466942c61fb0531d
Hans Boehm [Thu, 31 Jul 2014 22:49:07 +0000 (22:49 +0000)]
Merge "Remove 64-bit android_atomic uses from StateQueue." into lmp-dev
Hans Boehm [Wed, 16 Jul 2014 19:13:16 +0000 (12:13 -0700)]
Remove 64-bit android_atomic uses from StateQueue.
Use stdatomic.h instead. We're trying to remove android_atomic use
wherever possible. The 64-bit uses seem easiest to remove first.
This cleans up the code, though not as much as C++ <atomic> would,
if it worked everywhere.
(cherry picked from commit
f39b560952d3706a7ff47ef0d82c1a836daeea42)
Change-Id: I3c29bdbd5915cb9d47118834a3a742fe296cf87f
Lajos Molnar [Thu, 31 Jul 2014 21:43:22 +0000 (21:43 +0000)]
Merge "GenericSource: timed text support" into lmp-dev
Lajos Molnar [Thu, 31 Jul 2014 17:31:26 +0000 (10:31 -0700)]
GenericSource: timed text support
Bug:
16385674
Change-Id: Ib322cc13488dcadf2409921272cd469304b0af37
Robert Shih [Wed, 16 Jul 2014 22:47:09 +0000 (15:47 -0700)]
GenericSource: support track (de)selection
Bug:
15153976
Change-Id: Idfce856b4ca5fa7853da857757490798bc3ffe1e
Lajos Molnar [Thu, 31 Jul 2014 14:13:32 +0000 (07:13 -0700)]
mediaplayerservice: initialize mIsWidevine
Bug:
16641557
Change-Id: I77aad6e710117a16093726bf3b36360904fbe148
Lajos Molnar [Thu, 31 Jul 2014 19:46:13 +0000 (19:46 +0000)]
Merge "stagefright: propagate error in MPEG4Extractor::readMetaData" into lmp-dev
Lajos Molnar [Thu, 31 Jul 2014 19:07:58 +0000 (12:07 -0700)]
mediaplayer: add looping support to NuPlayer
Bug:
16641557
Change-Id: I433158e6e585b4714cfd6d89562ecd0587a07ae2
Lajos Molnar [Thu, 31 Jul 2014 19:09:37 +0000 (12:09 -0700)]
stagefright: propagate error in MPEG4Extractor::readMetaData
Bug:
16641557
Change-Id: I252825bd767a4581b9fca560f2cabfb37c18e137
Robert Shih [Thu, 31 Jul 2014 00:41:24 +0000 (17:41 -0700)]
NuPlayer: fix av discontinuity race
Assumption:
NuPlayer must see both (a/v) discontinuities before resuming.
Example issue:
Suppose we're changing the video track, so the video source queues a
DISCONTINUITY_FORMATCHANGE, and the audio source queues a DISCONTINUITY_NONE.
Consider this sequence of events without this change:
1. audio discontinuity seen by player
2. mFlushingAudio = FLUSHED
3. video discontinuity seen by player
4. mFlushingAudio != NONE so no performScanSources is queued
5. video decoding shuts down without being restarted
Bug:
15153976
Change-Id: I659550d9c0f883828103142abead857f576f25b1
Lajos Molnar [Thu, 31 Jul 2014 06:14:41 +0000 (06:14 +0000)]
Merge "stagefright: MediaCodec async operations." into lmp-dev
Lajos Molnar [Mon, 28 Jul 2014 04:21:32 +0000 (21:21 -0700)]
stagefright: enable decoder color format selection
Bug:
10706245
Change-Id: I9a77631bfae0358be229b079228c1fcae0e77faf
Lajos Molnar [Thu, 31 Jul 2014 01:54:08 +0000 (18:54 -0700)]
stagefright: MediaCodec async operations.
In async mode:
- codec must be restarted after flush
- dequeueIn/OutputBuffers fail
- getIn/OutputBuffers fail
Bug:
11990118
Change-Id: If2d6a76ab499ee9ed4a11486fb537acbc52e66f6
Wei Jia [Wed, 30 Jul 2014 20:40:49 +0000 (13:40 -0700)]
Robert Shih [Fri, 25 Jul 2014 21:14:34 +0000 (14:14 -0700)]
GenericSource: start/stop tracks correctly on selection
Change-Id: I10343151f930a4ab778a6d2574ab5165af2013ba
The Android Automerger [Tue, 29 Jul 2014 13:09:00 +0000 (06:09 -0700)]
merge in lmp-release history after reset to
4dc680607181e6a76f4e91a39366c4f5dfb7b03e
Eric Laurent [Tue, 29 Jul 2014 00:26:49 +0000 (17:26 -0700)]
audio policy: pass session ID to capture activity methods
Indicate the audio session ID when calling getInput(),
startInput(), stopInput(), releaseInput().
Bug:
12378680.
Change-Id: I763793752f93e2f4e1445a5ab217c895af011038
Eino-Ville Talvala [Thu, 24 Jul 2014 00:17:59 +0000 (17:17 -0700)]
CameraService: Clean up availability listeners and HAL error codes
- Refactor where availability listeners are called to centralize behavior,
ensuring that all client creation/destruction invokes the listeners
- Clean up some of the client hierarchy
- Filter error codes from key HAL calls to ensure proper reporting
Bug:
16514157
Bug:
16483222
Change-Id: I59875a865b6a508b47423946c78862da8df34cd1
Glenn Kasten [Mon, 28 Jul 2014 23:55:02 +0000 (23:55 +0000)]
Merge "Fix rounding in RecordThread resampler buffer computation" into lmp-dev
Andy Hung [Mon, 28 Jul 2014 21:38:41 +0000 (14:38 -0700)]
Fix rounding in RecordThread resampler buffer computation
Bug:
16525305
Change-Id: Ie010822b0fa9dec74adde1d1b091ee44c183fc94
Eric Laurent [Mon, 28 Jul 2014 01:38:22 +0000 (18:38 -0700)]
rename AudioSystem::newAudioSessionId()
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.
Bug:
12378680.
Change-Id: I611ea3b5eb57a4b0774437f477ee87dc4ccc2cc2
The Android Automerger [Mon, 28 Jul 2014 16:20:15 +0000 (09:20 -0700)]
merge in lmp-release history after reset to
f5bdd770d509373cc4174a55d0b81b223ecc4d81
Lajos Molnar [Mon, 28 Jul 2014 04:22:11 +0000 (21:22 -0700)]
mediaplayer: make nuplayer the default player
Bug:
11784824
Change-Id: I60d215d0348adcd589da5bd479d5921dcf076ee4
The Android Automerger [Sun, 27 Jul 2014 13:08:30 +0000 (06:08 -0700)]
merge in lmp-release history after reset to
03c556ae1eb409ad088c49037e185946c54e1d25
The Android Automerger [Sat, 26 Jul 2014 13:09:24 +0000 (06:09 -0700)]
merge in lmp-release history after reset to
03c556ae1eb409ad088c49037e185946c54e1d25
Lajos Molnar [Fri, 25 Jul 2014 14:53:14 +0000 (07:53 -0700)]
stagefright: add flexible YUV support
Bug:
10706245
Change-Id: Icd246f22edfc67ed5240d59f5a5bde3e5f749465
Lajos Molnar [Fri, 25 Jul 2014 14:53:14 +0000 (07:53 -0700)]
stagefright: add ABuffer.CreateAsCopy
Bug:
10706245
Change-Id: I8c4e96a2581a039e9e8237c3e09e2c22226da055
Chong Zhang [Thu, 31 Jul 2014 01:27:58 +0000 (01:27 +0000)]
Merge "handle rotation in NuPlayer" into lmp-dev
Chong Zhang [Thu, 31 Jul 2014 00:25:06 +0000 (17:25 -0700)]
handle rotation in NuPlayer
Bug:
16653284
Change-Id: I54165041da5a13498d627eee1b3ec59ef3c923b0
Andy Hung [Wed, 30 Jul 2014 18:08:00 +0000 (18:08 +0000)]
Merge "Add Quad channel output to AudioPolicyManager" into lmp-dev
Eric Laurent [Tue, 29 Jul 2014 17:26:26 +0000 (10:26 -0700)]
audio policy: add missing enums in config file parsing
Change-Id: I4edd6cde11de62c9c19dfa623d08cddf42c953db
Andy Hung [Wed, 30 Jul 2014 00:56:46 +0000 (17:56 -0700)]
Add Quad channel output to AudioPolicyManager
Matches some USB device configurations.
Change-Id: I2429f9de87816b4ad1d39516e3821562617c76ee
Andy Hung [Wed, 30 Jul 2014 00:59:56 +0000 (00:59 +0000)]
Merge "Add isSafeArraySize for new array size checks" into lmp-dev
Andy Hung [Tue, 29 Jul 2014 19:14:00 +0000 (12:14 -0700)]
Add isSafeArraySize for new array size checks
Bug:
15328708
Change-Id: I9dfca30745c3e4dda91c3894363462f8631c41a1
Andy Hung [Tue, 29 Jul 2014 23:53:25 +0000 (23:53 +0000)]
Merge "Enable multichannel in AudioFlinger" into lmp-dev
Andy Hung [Tue, 29 Jul 2014 23:52:28 +0000 (23:52 +0000)]
Merge "Update multichannel audio policy handling" into lmp-dev
Glenn Kasten [Mon, 28 Jul 2014 23:34:45 +0000 (16:34 -0700)]
Fix build warnings
Change-Id: Ife5e40264f43fb3ccb40830228701003fe106bf5
Andy Hung [Mon, 28 Jul 2014 23:28:06 +0000 (16:28 -0700)]
Enable multichannel in AudioFlinger
Change-Id: Ibdbdc6ea0b87cdcd15432257a3455b11b3ce14b7
Andy Hung [Mon, 28 Jul 2014 23:16:31 +0000 (16:16 -0700)]
Update multichannel audio policy handling
Ensure AUDIO_FORMAT_PCM_FLOAT and AUDIO_FORMAT_PCM_32_BIT
have proper precedence.
Allow more mixer channels than 2.
Change-Id: I02af97dad6218b25cbada4d93077a213314c6725
Chong Zhang [Thu, 31 Jul 2014 00:01:12 +0000 (00:01 +0000)]
Merge "ATSParser: treat stream type 0x83 as TrueHD AC3" into lmp-dev
Chong Zhang [Wed, 30 Jul 2014 22:40:31 +0000 (15:40 -0700)]
ATSParser: treat stream type 0x83 as TrueHD AC3
Bug:
16668055
Change-Id: I11fd3f795bbb50113e1a1e28e682edd76f11e146
Wei Jia [Wed, 30 Jul 2014 20:40:49 +0000 (13:40 -0700)]
Eino-Ville Talvala [Tue, 29 Jul 2014 19:01:19 +0000 (19:01 +0000)]
Merge "Camera2: Fix transforms for front-facing cameras" into lmp-dev
Eino-Ville Talvala [Tue, 29 Jul 2014 18:16:17 +0000 (11:16 -0700)]
Camera2: Fix transforms for front-facing cameras
Mirror, mirror on the wall, who is the best rotated of them all?
Also, use consistent enum names.
Bug:
16637957
Change-Id: Ie211d3b57b9e7d01122192ad03b73ceba5bf1bd3
Eino-Ville Talvala [Fri, 25 Jul 2014 01:10:23 +0000 (18:10 -0700)]
CameraService: Replace deprecated native_window methods
Change-Id: I3be5a720ac8b488d1e507c606a9146480faeef63
Eino-Ville Talvala [Thu, 24 Jul 2014 00:17:59 +0000 (17:17 -0700)]
CameraService: Clean up availability listeners and HAL error codes
- Refactor where availability listeners are called to centralize behavior,
ensuring that all client creation/destruction invokes the listeners
- Clean up some of the client hierarchy
- Filter error codes from key HAL calls to ensure proper reporting
Bug:
16514157
Bug:
16483222
Change-Id: I59875a865b6a508b47423946c78862da8df34cd1
Eric Laurent [Mon, 28 Jul 2014 20:56:49 +0000 (20:56 +0000)]
Merge "AudioFlinger: update openInput() and openOutput()" into lmp-dev
Eric Laurent [Fri, 25 Jul 2014 23:20:43 +0000 (16:20 -0700)]
AudioFlinger: update openInput() and openOutput()
Add parameters to openInput() and openOutput(): device address,
input source.
Allow caller to specify a given I/O handle
Group parameters in a struct audio_config.
Bug:
12378680.
Change-Id: I7e9af74c0d996561cc13cbee7d9012d2daf33025
Ruben Brunk [Sat, 26 Jul 2014 01:18:08 +0000 (01:18 +0000)]
Merge "DNG: Clean up logging." into lmp-dev
Ruben Brunk [Sat, 26 Jul 2014 01:05:46 +0000 (18:05 -0700)]
DNG: Clean up logging.
Change-Id: Ie34d5a22c89a726215d740fef359d53e5a1a360b
Robert Shih [Tue, 29 Jul 2014 17:00:27 +0000 (17:00 +0000)]
Merge "SampleTable: check integer overflow during table alloc" into lmp-dev
Robert Shih [Tue, 29 Jul 2014 16:58:01 +0000 (16:58 +0000)]
Merge "GenericSource: start/stop tracks correctly on selection" into lmp-dev
Robert Shih [Mon, 28 Jul 2014 16:54:57 +0000 (09:54 -0700)]
SampleTable: check integer overflow during table alloc
Bug:
15328708
Bug:
15342615
Bug:
15342751
Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053
Robert Shih [Fri, 25 Jul 2014 21:14:34 +0000 (14:14 -0700)]
GenericSource: start/stop tracks correctly on selection
Change-Id: I10343151f930a4ab778a6d2574ab5165af2013ba
Robert Shih [Mon, 28 Jul 2014 20:01:04 +0000 (20:01 +0000)]
Merge "GenericSource: timed text support" into lmp-dev
Robert Shih [Wed, 23 Jul 2014 22:53:14 +0000 (15:53 -0700)]
GenericSource: timed text support
Bug:
16385674
Change-Id: I954cc463b55af4b93c6a6e714115db4fda729dc8
Robert Shih [Sat, 26 Jul 2014 01:04:22 +0000 (01:04 +0000)]
Merge "NuPlayer: timed text support" into lmp-dev
Robert Shih [Wed, 23 Jul 2014 22:00:25 +0000 (15:00 -0700)]
NuPlayer: timed text support
Bug:
16385674
Change-Id: Ifa9fbc17a1276aa774d57b82cdce500876a0b543
Robert Shih [Thu, 24 Jul 2014 21:00:09 +0000 (14:00 -0700)]
StagefrightRecorder: check for WEBM format instead of MP4
Bug:
16544665
Change-Id: Idc45bd4cafc65a11132d10fdf21f8439e186f35f
Glenn Kasten [Sun, 27 Jul 2014 22:39:40 +0000 (22:39 +0000)]
Merge "Enable lower latency audio capture on more devices" into lmp-dev
Glenn Kasten [Sun, 27 Jul 2014 22:02:23 +0000 (15:02 -0700)]
Enable lower latency audio capture on more devices
Bug:
16601366
Change-Id: I573b98631f81b7768f7cc00aa09e560008dea587
Jean-Michel Trivi [Tue, 22 Jul 2014 23:19:14 +0000 (16:19 -0700)]
AudioPolicyManager: handle outputs for different addresses
Add the notion of device types that cause the device address
to be taken into account, i.e. multiple devices of the
same type but with a different address can be connected/
disconnected.
AUDIO_DEVICE_OUT_REMOTE_SUBMIX is such a device type.
When making those devices available / unavailable, look for
all outputs with a matching address.
Bug
16009464
Change-Id: I260f8248b7794c4932094e876afdf29fdea007a3
Glenn Kasten [Sun, 27 Jul 2014 22:05:14 +0000 (22:05 +0000)]
Merge "audio policy: compatible sample rates and channel masks" into lmp-dev
Eric Laurent [Sun, 27 Jul 2014 20:47:31 +0000 (13:47 -0700)]
audiopolicy: fix output audio format selection
Fix two problems in output stream audio format selection
added by commit
1e693b55:
- flags must be set before picking the format.
- fix logic error in best format selection.
Change-Id: I6458b32725f771da5a08108932d64e71964ae9f1
Glenn Kasten [Thu, 24 Jul 2014 20:46:44 +0000 (13:46 -0700)]
audio policy: compatible sample rates and channel masks
Change-Id: I50d068a968aa6bd9e53e5b3111a1b09a6c2d219c
Zhijun He [Sat, 26 Jul 2014 00:57:14 +0000 (00:57 +0000)]
Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev