OSDN Git Service

android-x86/frameworks-av.git
10 years agoadd sound trigger native service
Eric Laurent [Sat, 19 Apr 2014 00:40:41 +0000 (17:40 -0700)]
add sound trigger native service

Change-Id: I0cd954c1c7d28a334e786d0004431d4f6a1227ec

10 years agoMerge "Disable verbose logging"
Marco Nelissen [Mon, 2 Jun 2014 16:38:52 +0000 (16:38 +0000)]
Merge "Disable verbose logging"

10 years agoMerge "Start adding FastCapture based on FastThread WIP"
Glenn Kasten [Sun, 1 Jun 2014 19:39:54 +0000 (19:39 +0000)]
Merge "Start adding FastCapture based on FastThread WIP"

10 years agoam e1715a46: audio policy: add audio port gain control
Eric Laurent [Sat, 31 May 2014 01:55:53 +0000 (01:55 +0000)]
am e1715a46: audio policy: add audio port gain control

* commit 'e1715a465a29db625da9d0ea365edf371e39e201':
  audio policy: add audio port gain control

10 years agoam 1afeecb8: audio policy: parse device descriptors in config file
Eric Laurent [Sat, 31 May 2014 01:55:47 +0000 (01:55 +0000)]
am 1afeecb8: audio policy: parse device descriptors in config file

* commit '1afeecb88bea660b2c10b2096be0fd02433303ce':
  audio policy: parse device descriptors in config file

10 years agoresolved conflicts for merge of b52c152d to master
Eric Laurent [Sat, 31 May 2014 01:51:48 +0000 (18:51 -0700)]
resolved conflicts for merge of b52c152d to master

Change-Id: I34869bda071d511c9595ea0a5ff6571eb34da059

10 years agoaudio policy: add audio port gain control
Eric Laurent [Tue, 20 May 2014 18:30:42 +0000 (11:30 -0700)]
audio policy: add audio port gain control

Implement setAudioPortConfig() API to configure an
audio port.
Currently limited to gain control.

Bug: 14815883.

Change-Id: Ic1b268e5ba5c277e9f5b8fa63c81dd7c0b250024

10 years agoam 0289d545: am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 21:54:32 +0000 (21:54 +0000)]
am 0289d545: am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '0289d54520ba66b0d7f0913a89a524c89a01b87e':
  libcpustats: Turn on -Werror

10 years agoam 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 21:51:00 +0000 (21:51 +0000)]
am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '6ed77c130d80fe607ec91ada4cf5718d512b4ad5':
  libcpustats: Turn on -Werror

10 years agoam 2d0e8d8f: Merge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 21:47:19 +0000 (21:47 +0000)]
am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '2d0e8d8f75369b491362f2ea3a6efd5159df404c':
  libcpustats: Turn on -Werror

10 years agoMerge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 21:42:54 +0000 (21:42 +0000)]
Merge "libcpustats: Turn on -Werror"

10 years agoam 6a94d69d: audio policy: implement routing control
Eric Laurent [Fri, 30 May 2014 21:32:33 +0000 (21:32 +0000)]
am 6a94d69d: audio policy: implement routing control

* commit '6a94d69dc4f32abb53c466a96f905bb199be6417':
  audio policy: implement routing control

10 years agolibcpustats: Turn on -Werror
Mark Salyzyn [Fri, 30 May 2014 20:30:18 +0000 (13:30 -0700)]
libcpustats: Turn on -Werror

- Switch to static_assert from deprecated utils/Debug.h
- Turn on C++11 standard
- Turn on -Werror

Change-Id: I4f1c08bbcaf1ad3a97502cde756a2f42bcece789

10 years agoMerge "Add multiple format capability to FastMixer"
Andy Hung [Fri, 30 May 2014 17:30:06 +0000 (17:30 +0000)]
Merge "Add multiple format capability to FastMixer"

10 years agoDisable verbose logging
Marco Nelissen [Fri, 30 May 2014 17:13:25 +0000 (10:13 -0700)]
Disable verbose logging

Change-Id: If9c87615707ed67f209258f9207d56f671cd0f08

10 years agoMerge "handle in and out audio device connection separately"
Eric Laurent [Fri, 30 May 2014 17:09:04 +0000 (17:09 +0000)]
Merge "handle in and out audio device connection separately"

10 years agoAdd multiple format capability to FastMixer
Andy Hung [Sat, 24 May 2014 04:22:17 +0000 (21:22 -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

10 years agoaudio policy: parse device descriptors in config file
Eric Laurent [Wed, 14 May 2014 15:52:28 +0000 (08:52 -0700)]
audio policy: parse device descriptors in config file

Implement parsing of audio_policy.conf for device and gain
controller definitions.
Copy audio_policy_conf.h from hardware_legacy.
New syntax for devices and gain controllers description will not
be parsed by legacy audio policy manager.

Bug: 14815883.

Change-Id: I7f1035d514dcf55fb3e45ed1f633a2f63ee398f5

10 years agoaudio policy: add routing update client interface
Eric Laurent [Tue, 20 May 2014 18:27:36 +0000 (11:27 -0700)]
audio policy: add routing update client interface

Added IAudioPolicyServiceClient client binder interface
for client process to receive notifications from AudioPolicyService
when audio ports are added/removed or audio patches created/released.

The audio patches owned by a given client are automatically released when
this client binder dies.

Bug: 14815883.

Change-Id: I6013f6aec03b50565cffb1ad2cd1f0f8852032c5

10 years agoaudio policy: implement routing control
Eric Laurent [Tue, 20 May 2014 18:18:06 +0000 (11:18 -0700)]
audio policy: implement routing control

Add implementation of audio routing control via AudioSystem APIs.

The following APIs are implemented:
- listAudioPorts(): return a list of devices and output/input mixers ports
that can be used as sources or sinks for audio patches.
- createAudioPatch()/releaseAudioPatch(): create/release a connection patch between
two audio ports (e.g. to connect input from an HDMI device to a speaker output device).
Only one client application can own a patch from a given source.
When an audio port (device or mix) is part of an application created patch, its routing cannot
not be changed by a policy decision.
- listAudioPatches(): return a list of existing patches.

Each audio port addition/removal and each audio patch creation/release increments a generation count.
This generation count is used to ensure consistency betwen calls to
listAudioPorts() and listAudioPatches().

Bug: 14815883.

Change-Id: I022b638c2f5f0bb41543c7cfca7488fb45cfdd80

10 years agoMerge "Avoid resetting BufferProviders in mixer unnecessarily"
Andy Hung [Thu, 29 May 2014 23:22:40 +0000 (23:22 +0000)]
Merge "Avoid resetting BufferProviders in mixer unnecessarily"

10 years agohandle in and out audio device connection separately
Eric Laurent [Thu, 29 May 2014 23:08:11 +0000 (16:08 -0700)]
handle in and out audio device connection separately

AudioService now indicates in and out device connection
separately in case of combined devices like wired headset
or BT SCO headset.

Change-Id: I97adf8343d0ce32c279ffc3cce5c84ca7a349e16

10 years agoAvoid resetting BufferProviders in mixer unnecessarily
Andy Hung [Thu, 29 May 2014 22:53:09 +0000 (15:53 -0700)]
Avoid resetting BufferProviders in mixer unnecessarily

Change-Id: Iad85c4dfd21be1dbf89dc11906106b34219376f8

10 years agoMerge "AAC decoder: compensate limiter delay"
Jean-Michel Trivi [Thu, 29 May 2014 21:42:08 +0000 (21:42 +0000)]
Merge "AAC decoder: compensate limiter delay"

10 years agoAAC decoder: compensate limiter delay
Jean-Michel Trivi [Wed, 21 May 2014 01:32:17 +0000 (18:32 -0700)]
AAC decoder: compensate limiter delay

Add decoder limiter delay compensation to decoder wrapper
Includes a wrapper function for SoftAAC2.cpp which selects
 DRC-related decoder parameters according to information in the bitstream
 and desired DRC characteristics for different playback modes.

Bug 9428126

Change-Id: I5041b68760e95cf54073c3addf2b6026b9cfe8c5

10 years agoMerge "getSampletime -> getSampleTime"
Marco Nelissen [Thu, 29 May 2014 15:35:07 +0000 (15:35 +0000)]
Merge "getSampletime -> getSampleTime"

10 years agogetSampletime -> getSampleTime
Marco Nelissen [Thu, 29 May 2014 15:04:34 +0000 (08:04 -0700)]
getSampletime -> getSampleTime

Change-Id: I87aaa87be068d414903a0e1e22bfe4183cf45ab0

10 years agoam 32f93b7b: (-s ours) DO NOT MERGE: libstagefright: Add Opus support to ACodec:...
Vignesh Venkatasubramanian [Thu, 29 May 2014 09:43:18 +0000 (09:43 +0000)]
am 32f93b7b: (-s ours) DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat

* commit '32f93b7bedc44b425ba99d69dec998334e759532':
  DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat

10 years agoDO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat
Vignesh Venkatasubramanian [Wed, 28 May 2014 14:59:35 +0000 (07:59 -0700)]
DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat

Bug: 15114855
Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67
(cherry picked from commit 8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55)

10 years agoMerge "libstagefright: Add Opus support to ACodec::getPortFormat"
Lajos Molnar [Thu, 29 May 2014 02:07:16 +0000 (02:07 +0000)]
Merge "libstagefright: Add Opus support to ACodec::getPortFormat"

10 years agolibstagefright: Add Opus support to ACodec::getPortFormat
Vignesh Venkatasubramanian [Wed, 28 May 2014 14:59:35 +0000 (07:59 -0700)]
libstagefright: Add Opus support to ACodec::getPortFormat

Bug: 15114855
Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67

10 years agoam f948c894: (-s ours) Merge "DO NOT MERGE - IAudioPolicyService interface extension...
Eric Laurent [Thu, 29 May 2014 00:42:27 +0000 (00:42 +0000)]
am f948c894: (-s ours) Merge "DO NOT MERGE - IAudioPolicyService interface extension for patch panel" into lmp-preview-dev

* commit 'f948c894d47797f5846b823b32fac3856709064b':
  DO NOT MERGE - IAudioPolicyService interface extension for patch panel

10 years agoam bf68f164: (-s ours) Merge "DO NOT MERGE - audioflinger: first patch panel implemen...
Eric Laurent [Thu, 29 May 2014 00:42:26 +0000 (00:42 +0000)]
am bf68f164: (-s ours) Merge "DO NOT MERGE - audioflinger: first patch panel implementation." into lmp-preview-dev

* commit 'bf68f164b5d8a0ad948bfa9c2cbfb0acf7c0e694':
  DO NOT MERGE - audioflinger: first patch panel implementation.

10 years agoam e0755b63: (-s ours) Merge "DO NOT MERGE - IAudioFlinger interface extension for...
Eric Laurent [Thu, 29 May 2014 00:42:26 +0000 (00:42 +0000)]
am e0755b63: (-s ours) Merge "DO NOT MERGE - IAudioFlinger interface extension for patch panel" into lmp-preview-dev

* commit 'e0755b6318fe1465af60b1113dba19ba146ef05a':
  DO NOT MERGE - IAudioFlinger interface extension for patch panel

10 years agoam def41bb3: (-s ours) Merge "DO NOT MERGE - audioflinger: fix deadlock upon AudioRec...
Eric Laurent [Thu, 29 May 2014 00:42:25 +0000 (00:42 +0000)]
am def41bb3: (-s ours) Merge "DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error" into lmp-preview-dev

* commit 'def41bb3770e72945071c0bb2e11726757a39163':
  DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error

10 years agoam 4c68c685: (-s ours) Merge "DO NOT MERGE - audio policy: enable use of new AudioPol...
Eric Laurent [Thu, 29 May 2014 00:42:25 +0000 (00:42 +0000)]
am 4c68c685: (-s ours) Merge "DO NOT MERGE - audio policy: enable use of new AudioPolicyManager" into lmp-preview-dev

* commit '4c68c68532f47330903be70dba9371f3e842516c':
  DO NOT MERGE - audio policy: enable use of new AudioPolicyManager

10 years agoam 16f093cd: (-s ours) Merge "DO NOT MERGE - audioflinger: test min HAL version inste...
Eric Laurent [Thu, 29 May 2014 00:42:09 +0000 (00:42 +0000)]
am 16f093cd: (-s ours) Merge "DO NOT MERGE - audioflinger: test min HAL version instead of current" into lmp-preview-dev

* commit '16f093cde143a6c80566ea5c79c9de2cfdf5ac45':
  DO NOT MERGE - audioflinger: test min HAL version instead of current

10 years agoMerge "Update dynamic resampler buffer fetching"
Andy Hung [Thu, 29 May 2014 00:05:57 +0000 (00:05 +0000)]
Merge "Update dynamic resampler buffer fetching"

10 years agoam 8c268801: am 215f7b91: am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force defaul...
Brian Carlstrom [Wed, 28 May 2014 23:18:44 +0000 (23:18 +0000)]
am 8c268801: am 215f7b91: am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit '8c268801f8b3075b97c40cd128dd7bebd7d35ad0':
  Move to dalvik.vm.lib.2 to force default to libart

10 years agoam 215f7b91: am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 23:13:25 +0000 (23:13 +0000)]
am 215f7b91: am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit '215f7b91ed831e6d37909ead1119dcde13d50895':
  Move to dalvik.vm.lib.2 to force default to libart

10 years agoMerge "Fix some NuPlayer issues."
Marco Nelissen [Wed, 28 May 2014 22:33:22 +0000 (22:33 +0000)]
Merge "Fix some NuPlayer issues."

10 years agoam df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 22:31:41 +0000 (22:31 +0000)]
am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit 'df9b1ff3726e263c8533add096435520ca4b7d61':
  Move to dalvik.vm.lib.2 to force default to libart

10 years agoMerge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 22:28:37 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"

10 years agoFix some NuPlayer issues.
Marco Nelissen [Wed, 28 May 2014 22:23:14 +0000 (15:23 -0700)]
Fix some NuPlayer issues.

Fixes OnSeekCompleted callback and calling getDuration immediately
after prepare().

Change-Id: Ie58c509005cded278a0e50c87240b0a2d920b7d7

10 years agoMerge "DO NOT MERGE - IAudioPolicyService interface extension for patch panel" into...
Eric Laurent [Wed, 28 May 2014 22:22:38 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - IAudioPolicyService interface extension for patch panel" into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - audioflinger: first patch panel implementation." into lmp-previ...
Eric Laurent [Wed, 28 May 2014 22:22:33 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - audioflinger: first patch panel implementation." into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - IAudioFlinger interface extension for patch panel" into lmp...
Eric Laurent [Wed, 28 May 2014 22:22:25 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - IAudioFlinger interface extension for patch panel" into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error...
Eric Laurent [Wed, 28 May 2014 22:22:19 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error" into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - audio policy: enable use of new AudioPolicyManager" into lmp...
Eric Laurent [Wed, 28 May 2014 22:22:13 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - audio policy: enable use of new AudioPolicyManager" into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - audioflinger: test min HAL version instead of current" into...
Eric Laurent [Wed, 28 May 2014 22:10:41 +0000 (22:10 +0000)]
Merge "DO NOT MERGE - audioflinger: test min HAL version instead of current" into lmp-preview-dev

10 years agoMerge "Add audio policy support for A2DP sink"
Mike Lockwood [Wed, 28 May 2014 21:54:02 +0000 (21:54 +0000)]
Merge "Add audio policy support for A2DP sink"

10 years agoMove to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart

Bug: 14298175

(cherry picked from commit 483f59ab9fb4b2d8ab212f77a50eed0528beca58)

Change-Id: I387af6e4721840f98063f26854c02e6da26b9974

10 years agoam 483f59ab: Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 21:44:56 +0000 (21:44 +0000)]
am 483f59ab: Move to dalvik.vm.lib.2 to force default to libart

* commit '483f59ab9fb4b2d8ab212f77a50eed0528beca58':
  Move to dalvik.vm.lib.2 to force default to libart

10 years agoMove to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart

Bug: 14298175
Change-Id: Iff6940aba8accfec14e729d53b71d2ed7e6c5027

10 years agoDO NOT MERGE - IAudioPolicyService interface extension for patch panel
Eric Laurent [Tue, 1 Apr 2014 17:34:16 +0000 (10:34 -0700)]
DO NOT MERGE - IAudioPolicyService interface extension for patch panel

Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1

10 years agoDO NOT MERGE - audioflinger: first patch panel implementation.
Eric Laurent [Tue, 20 May 2014 17:48:17 +0000 (10:48 -0700)]
DO NOT MERGE - audioflinger: first patch panel implementation.

Added a new PatchPanel subclass to AudioFlinger
to handle audio ports and audio patches configuration
and connection.
The first implementation does not add new functionnality.
AudioPolicyManager uses patch panel interface to control
device routing.
AudioFlinger:
- Added PatchPanel class. The first implementation does not
add new functionnality. PatchPanel handles routing commands
for audio HAL after 3.0 or converts to setParameters for audio
HALs before 3.0.
- Added config events to ThreadBase to control synchronized
audio patch connection.
AudioPolicyManager:
- Use PatchPanel API to control device selection isntead of setParameters.
- New base class AudioPort common to audio device descriptors
and input output stream profiles. This class is RefBase and groups
attributes common to audio ports.
- Use same device selection flow for input as for outputs:
 getNewInputDevice -> getDeviceForInptusiource -> setInputDevice

Change-Id: Idaa5a883b19a45816651c58cac697640dc717cd9

10 years agoDO NOT MERGE - IAudioFlinger interface extension for patch panel
Eric Laurent [Fri, 11 Apr 2014 16:22:20 +0000 (09:22 -0700)]
DO NOT MERGE - IAudioFlinger interface extension for patch panel

Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330

10 years agoUpdate dynamic resampler buffer fetching
Andy Hung [Tue, 27 May 2014 19:32:17 +0000 (12:32 -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

10 years agoDO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error
Eric Laurent [Mon, 26 May 2014 23:03:08 +0000 (16:03 -0700)]
DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error

AudioFlinger:openRecord() should not hold mClientLock when
releasing the local reference on AudioRecord as the destructor will
also lock mClientLock.
Same fix for AudioFlinger::createTrack().
Also make sure that AudioFlinger::createEffect() holds mClientLock
when clearing local reference to the Client in case of error.

Regression introduced by 021cf9634ab09c0753a40b7c9ef4ba603be5c3da

Bug: 15118096.
Change-Id: Ie961c398c8e0460bca9b95e2ee4ce6859316c275

10 years agoDO NOT MERGE - audio policy: enable use of new AudioPolicyManager
Eric Laurent [Fri, 23 May 2014 00:30:48 +0000 (17:30 -0700)]
DO NOT MERGE - audio policy: enable use of new AudioPolicyManager

Do not define USE_LEGACY_AUDIO_POLICY by default.
By default, all devices will now use the new audio policy implementation
in AudioPolicyManager.cpp

To continue using the legacy audio policy implemented by
AudioPolicyManagerBase in libhardware_legacy a device should
define USE_LEGACY_AUDIO_POLICY in its makefile.

Change-Id: I7b8cac3cbb24b11105ba6233501c7212f5985727

10 years agoDO NOT MERGE - audioflinger: test min HAL version instead of current
Eric Laurent [Thu, 22 May 2014 19:23:26 +0000 (12:23 -0700)]
DO NOT MERGE - audioflinger: test min HAL version instead of current

Change-Id: Ibce2353b4390329b4c1a453e829178e3986c25a7

10 years agoMerge "IAudioPolicyService interface extension for patch panel"
Eric Laurent [Wed, 28 May 2014 16:13:30 +0000 (16:13 +0000)]
Merge "IAudioPolicyService interface extension for patch panel"

10 years agoMerge "audioflinger: first patch panel implementation."
Eric Laurent [Wed, 28 May 2014 15:37:58 +0000 (15:37 +0000)]
Merge "audioflinger: first patch panel implementation."

10 years agoMerge "IAudioFlinger interface extension for patch panel"
Eric Laurent [Wed, 28 May 2014 15:16:21 +0000 (15:16 +0000)]
Merge "IAudioFlinger interface extension for patch panel"

10 years agoAdd audio policy support for A2DP sink
Mike Lockwood [Tue, 13 May 2014 22:23:35 +0000 (15:23 -0700)]
Add audio policy support for A2DP sink

Change-Id: Ifcad9c1d4bdb79668e03a31d843ec46670dd0bd8

10 years agoMerge "Allow kFastTrackMultiplier to be specified per device"
Glenn Kasten [Tue, 27 May 2014 23:19:29 +0000 (23:19 +0000)]
Merge "Allow kFastTrackMultiplier to be specified per device"

10 years agoAllow kFastTrackMultiplier to be specified per device
Glenn Kasten [Tue, 27 May 2014 19:30:54 +0000 (12:30 -0700)]
Allow kFastTrackMultiplier to be specified per device

Change-Id: I4eaaaf038df720cec4f5d9221d1b632970f9e3dd

10 years agoMerge "Rename mixBuffer to mMixerBuffer in FastMixer"
Andy Hung [Tue, 27 May 2014 22:29:46 +0000 (22:29 +0000)]
Merge "Rename mixBuffer to mMixerBuffer in FastMixer"

10 years agoMerge "Remove codec callback for now."
Marco Nelissen [Tue, 27 May 2014 19:40:08 +0000 (19:40 +0000)]
Merge "Remove codec callback for now."

10 years agoMerge "Add multiple format capability to AudioMixer"
Andy Hung [Tue, 27 May 2014 18:32:15 +0000 (18:32 +0000)]
Merge "Add multiple format capability to AudioMixer"

10 years agoIAudioPolicyService interface extension for patch panel
Eric Laurent [Tue, 1 Apr 2014 17:34:16 +0000 (10:34 -0700)]
IAudioPolicyService interface extension for patch panel

Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1

10 years agoaudioflinger: first patch panel implementation.
Eric Laurent [Tue, 20 May 2014 17:48:17 +0000 (10:48 -0700)]
audioflinger: first patch panel implementation.

Added a new PatchPanel subclass to AudioFlinger
to handle audio ports and audio patches configuration
and connection.
The first implementation does not add new functionnality.
AudioPolicyManager uses patch panel interface to control
device routing.
AudioFlinger:
- Added PatchPanel class. The first implementation does not
add new functionnality. PatchPanel handles routing commands
for audio HAL after 3.0 or converts to setParameters for audio
HALs before 3.0.
- Added config events to ThreadBase to control synchronized
audio patch connection.
AudioPolicyManager:
- Use PatchPanel API to control device selection isntead of setParameters.
- New base class AudioPort common to audio device descriptors
and input output stream profiles. This class is RefBase and groups
attributes common to audio ports.
- Use same device selection flow for input as for outputs:
 getNewInputDevice -> getDeviceForInptusiource -> setInputDevice

Change-Id: Idaa5a883b19a45816651c58cac697640dc717cd9

10 years agoMerge "audioflinger: fix deadlock upon AudioRecord creation error"
Eric Laurent [Tue, 27 May 2014 16:51:59 +0000 (16:51 +0000)]
Merge "audioflinger: fix deadlock upon AudioRecord creation error"

10 years agoIAudioFlinger interface extension for patch panel
Eric Laurent [Fri, 11 Apr 2014 16:22:20 +0000 (09:22 -0700)]
IAudioFlinger interface extension for patch panel

Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330

10 years agoMerge "Move validation of frameCount from set to openRecord_l"
Glenn Kasten [Tue, 27 May 2014 14:35:48 +0000 (14:35 +0000)]
Merge "Move validation of frameCount from set to openRecord_l"

10 years agoaudioflinger: fix deadlock upon AudioRecord creation error
Eric Laurent [Mon, 26 May 2014 23:03:08 +0000 (16:03 -0700)]
audioflinger: fix deadlock upon AudioRecord creation error

AudioFlinger:openRecord() should not hold mClientLock when
releasing the local reference on AudioRecord as the destructor will
also lock mClientLock.
Same fix for AudioFlinger::createTrack().
Also make sure that AudioFlinger::createEffect() holds mClientLock
when clearing local reference to the Client in case of error.

Regression introduced by 021cf9634ab09c0753a40b7c9ef4ba603be5c3da

Bug: 15118096.
Change-Id: Ie961c398c8e0460bca9b95e2ee4ce6859316c275

10 years agoRename mixBuffer to mMixerBuffer in FastMixer
Andy Hung [Sat, 24 May 2014 04:13:31 +0000 (21:13 -0700)]
Rename mixBuffer to mMixerBuffer in FastMixer

Likewise mixBufferState becomes mMixerBufferState.
This harmonizes with the naming in AF::MixerThread.

Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122

10 years agoAdd multiple format capability to AudioMixer
Andy Hung [Mon, 12 May 2014 23:51:41 +0000 (16:51 -0700)]
Add multiple format capability to AudioMixer

Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc
Signed-off-by: Andy Hung <hunga@google.com>
10 years agoMerge "Add format parameter to getTrackName() and track_t"
Andy Hung [Fri, 23 May 2014 23:51:17 +0000 (23:51 +0000)]
Merge "Add format parameter to getTrackName() and track_t"

10 years agoMerge "audio policy: enable use of new AudioPolicyManager"
Eric Laurent [Fri, 23 May 2014 23:01:16 +0000 (23:01 +0000)]
Merge "audio policy: enable use of new AudioPolicyManager"

10 years agoRemove codec callback for now.
Marco Nelissen [Fri, 23 May 2014 22:49:49 +0000 (15:49 -0700)]
Remove codec callback for now.

Change-Id: I7ef3c1fc7aa1bfec958e6ea58bf95ae35a575e91

10 years agoMerge "Allow track buffer "allocation" to be from pipe"
Glenn Kasten [Fri, 23 May 2014 21:32:24 +0000 (21:32 +0000)]
Merge "Allow track buffer "allocation" to be from pipe"

10 years agoam 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics...
Elliott Hughes [Fri, 23 May 2014 19:34:00 +0000 (19:34 +0000)]
am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '79262cfc14a9d8b5aa29d43e84ea91eedb9492ba':
  Move frameworks/av off <sys/atomics.h>.

10 years agoaudio policy: enable use of new AudioPolicyManager
Eric Laurent [Fri, 23 May 2014 00:30:48 +0000 (17:30 -0700)]
audio policy: enable use of new AudioPolicyManager

Do not define USE_LEGACY_AUDIO_POLICY by default.
By default, all devices will now use the new audio policy implementation
in AudioPolicyManager.cpp

To continue using the legacy audio policy implemented by
AudioPolicyManagerBase in libhardware_legacy a device should
define USE_LEGACY_AUDIO_POLICY in its makefile.

Change-Id: I7b8cac3cbb24b11105ba6233501c7212f5985727

10 years agoam 47ed7dfd: cameraservice: Fix ICameraDeviceUser aidl order.
Ruben Brunk [Fri, 23 May 2014 00:10:55 +0000 (00:10 +0000)]
am 47ed7dfd: cameraservice: Fix ICameraDeviceUser aidl order.

* commit '47ed7dfdae7a41a7532978bd799fa9defd2b9980':
  cameraservice: Fix ICameraDeviceUser aidl order.

10 years agoam 24adc040: merge in master-release history after reset to 77a3374a6170fb5f0168169bc...
The Android Automerger [Fri, 23 May 2014 00:10:55 +0000 (00:10 +0000)]
am 24adc040: merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb

* commit '24adc0400381612a97e8b30d83484f4107819d5c':
  Revert "camera: Fix setParameters for Preview FPS single/range values"
  stagefright: allow for minUndequeuedBufs to be one less
  camera3: Remove old vendor tag ops dependencies.
  Revert "Convert AudioFlinger mSinkBuffer to flexible format"
  Fix freeze on pause
  audioflinger: fix race condition in SyncEvent callback
  Support "data:" URIs again in mediaplayer...
  frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
  libstagefright: Delay release of wakelock in TimedEventQueue
  Revert "stagefright: fix TimedEventQueue wakelock"

10 years agoStart adding FastCapture based on FastThread WIP
Glenn Kasten [Thu, 13 Mar 2014 21:59:31 +0000 (14:59 -0700)]
Start adding FastCapture based on FastThread WIP

This version supports at most one fast capture client.

Change-Id: Idf609bfc80ae22433433d66a5232c043c65506df

10 years agoMove validation of frameCount from set to openRecord_l
Glenn Kasten [Mon, 12 May 2014 18:06:26 +0000 (11:06 -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

10 years agoAllow track buffer "allocation" to be from pipe
Glenn Kasten [Tue, 13 May 2014 17:41:52 +0000 (10:41 -0700)]
Allow track buffer "allocation" to be from pipe

Change-Id: Ib9ac170f8e8b7746b3588157a56cbee3b753a1cb

10 years agoam 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 22:50:51 +0000 (22:50 +0000)]
am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '5b756bfdaa27c8b606720544bf507213cf47376d':
  Move frameworks/av off <sys/atomics.h>.

10 years agoam 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 22:42:46 +0000 (22:42 +0000)]
am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0':
  Move frameworks/av off <sys/atomics.h>.

10 years agoMerge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 21:30:25 +0000 (21:30 +0000)]
Merge "Move frameworks/av off <sys/atomics.h>."

10 years agoMove frameworks/av off <sys/atomics.h>.
Elliott Hughes [Thu, 22 May 2014 21:20:39 +0000 (14:20 -0700)]
Move frameworks/av off <sys/atomics.h>.

Bug: 14903517
Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb

10 years agoaudioflinger: test min HAL version instead of current
Eric Laurent [Thu, 22 May 2014 19:23:26 +0000 (12:23 -0700)]
audioflinger: test min HAL version instead of current

Change-Id: Ibce2353b4390329b4c1a453e829178e3986c25a7

10 years agocameraservice: Fix ICameraDeviceUser aidl order.
Ruben Brunk [Thu, 22 May 2014 20:09:57 +0000 (13:09 -0700)]
cameraservice: Fix ICameraDeviceUser aidl order.

Bug: 15167467

Change-Id: I19eb3d2ff86c0b395b6358e018c677b6e2d45c75

10 years agoMerge "cameraservice: Fix ICameraDeviceUser aidl order."
Ruben Brunk [Thu, 22 May 2014 20:36:45 +0000 (20:36 +0000)]
Merge "cameraservice: Fix ICameraDeviceUser aidl order."

10 years agocameraservice: Fix ICameraDeviceUser aidl order.
Ruben Brunk [Thu, 22 May 2014 20:09:57 +0000 (13:09 -0700)]
cameraservice: Fix ICameraDeviceUser aidl order.

Change-Id: I19eb3d2ff86c0b395b6358e018c677b6e2d45c75

10 years agoresolved conflicts for merge of f285c91e to master
Elliott Hughes [Thu, 22 May 2014 17:14:43 +0000 (10:14 -0700)]
resolved conflicts for merge of f285c91e to master

Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65

10 years agomerge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb
The Android Automerger [Thu, 22 May 2014 14:21:54 +0000 (07:21 -0700)]
merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb

10 years agoam c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."
Calin Juravle [Thu, 22 May 2014 13:44:20 +0000 (13:44 +0000)]
am c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."

* commit 'c10b874c4d0d6208fb93a7aa0dc8af4418faad45':
  Move frameworks/av from fdprintf to POSIX dprintf.