summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Adding explicit routing API to AudioTrackPaul McLean2015-04-0812-11/+185
| | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
* AudioPolicy: remove extraneous parenthesesJean-Michel Trivi2015-04-031-1/+1
| | | | Change-Id: Ibcea37b90cc0aaacb3b6194745bf569edad8992a
* Merge "Updates to AudioPolicyManager refactor"Jean-Michel Trivi2015-04-015-13/+21
|\
| * Updates to AudioPolicyManager refactorJean-Michel Trivi2015-04-015-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use protected access in AudioPolicyManager class for - engine field - querying phone state - isStrategyActive Fix inclusion of AudioPolicyManagerInterface header. Use "APM_" prefix in audio policy conf parsing code to avoid naming conflicts with some HALs. DeviceDescriptor and its collection class are good friends now. Change-Id: I236d62a2b8a4b6bf68dd515932650b912577c145
* | Merge "Split ManagerDefault into manager and engine"Jean-Michel Trivi2015-04-0115-908/+1752
|\ \ | |/
| * Split ManagerDefault into manager and engineFrançois Gaffie2015-04-0115-908/+1752
| | | | | | | | | | | | | | | | | | | | | | This patch defines an interface for a new component: policy engine. The APIs found under this interface are the one we may want to customize and to configure easily. This patch also split the current manager code into manager and engine to provide a default version of the policy engine. Change-Id: I97cf59760b53d248fe9efe466ae5e73bd7e5cc06 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | Merge "Create StreamDescriptor and associated collection within common"Jean-Michel Trivi2015-04-018-246/+473
|\ \ | |/
| * Create StreamDescriptor and associated collection within commonFrançois Gaffie2015-04-018-246/+473
| | | | | | | | | | | | | | | | | | | | | | Create StreamDescriptor and associated collection within common common policy pillar elements. It moves the code from managerdefault and creates helpers function within the collection. It also split the AudioGain in a common volume header and AudioGain class. Change-Id: I1bb80e4219506f8c9042367085db328d317cb668 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | Merge "Create SoundTriggerSession and associated collection within common"Jean-Michel Trivi2015-04-015-17/+86
|\ \ | |/
| * Create SoundTriggerSession and associated collection within commonFrançois Gaffie2015-04-015-17/+86
| | | | | | | | | | | | | | | | | | | | This patch creates a SoundTriggerSession and associated collection within common policy pillar elements. It moves the code from managerdefault and creates helpers function within the collection. Change-Id: I83ea230573c05e8ab99f4489c20059ed27678221 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | Merge "Add EffectDescriptor and associated collection to common elements"Jean-Michel Trivi2015-04-017-181/+288
|\ \ | |/
| * Add EffectDescriptor and associated collection to common elementsFrançois Gaffie2015-04-017-181/+288
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds EffectDescriptor and associated collection to common policy pillar elements. It moves the code from the policy manager and creates helpers function in the collection. It also factorize the RoutingStrategy structure within a separated header file. Change-Id: I29964ff77564fadedf3237c8754240b21ae77297 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | Merge "Add AudioMix and AudioMixCollection to common policy element"Jean-Michel Trivi2015-04-015-102/+307
|\ \ | |/
| * Add AudioMix and AudioMixCollection to common policy elementFrançois Gaffie2015-04-015-102/+307
| | | | | | | | | | | | | | | | | | | | This patch adds AudioMix and associated collection to the common policy pillar elements library. It removes the code from the manager and creates also helpers function associated to the mix collection. Change-Id: Ia3536fdef09da13734d2895030d736c701040237 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | Merge "Migrate helper functions from managerdefault to common"Jean-Michel Trivi2015-04-0120-653/+977
|\ \ | |/
| * Migrate helper functions from managerdefault to commonFrançois Gaffie2015-04-0120-653/+977
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves from manager to common: -parse helper functions of the policy configuration file -collection helper function on -output / input descriptors -DeviceDescriptor -AudioPatch / Audio Port -IO Profile -HwModule Change-Id: If45e53418db75af1af198f43c4ef27884499055f Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | Merge "Split ManagerDefault into Manager and ManagerDefinitions"Jean-Michel Trivi2015-04-0125-132/+233
|\ \ | |/
| * Split ManagerDefault into Manager and ManagerDefinitionsFrançois Gaffie2015-04-0125-132/+233
| | | | | | | | | | | | | | | | | | | | | | | | This patch splits the managerdefault into a manager and a manager defintion library that contains all pillar elements of a policy manager. It renames the file with the name of the main class they contains. It splits the AudioPort into AudioPort and AudioPatch. Change-Id: I992cf0b8aed895805cc003ba0980d2c9e92c985b Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | Merge "Audio Policy Refactor: reorganise headers inclusion"Jean-Michel Trivi2015-04-0120-58/+159
|\ \ | |/
| * Audio Policy Refactor: reorganise headers inclusionFrançois Gaffie2015-04-0120-58/+159
| | | | | | | | | | | | | | | | | | | | | | | | This patch reoganises the headers inclusion in order to prepare the split of managerdefault into a manager and a separated lib of pillar policy elements. It also moves back the isStrategyActive to the manager to avoid any dependancies from this pillars to the manager. Change-Id: I1a35c45d86db7a3878a40dc7d6858dfea37c5ac9 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | audio flinger: fix standby on output with HW A/V syncEric Laurent2015-04-012-2/+13
|/ | | | | | | | | | Fix a bug in audio HAL pause logic on output threads with HW A/V sync preventing the HAL to enter standby when the audio track is stopped and detroyed. Bug: 19980184. Change-Id: Ia497dad23159038b447fcbc18a67bb61b70b79cc
* Merge "camera2: Enforce client eviction on user switch."Ruben Brunk2015-03-312-18/+134
|\
| * camera2: Enforce client eviction on user switch.Ruben Brunk2015-03-312-18/+134
| | | | | | | | | | Bug: 19186859 Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
* | Merge "Camera: iterate through all encoders for finding max video size"Yin-Chia Yeh2015-03-311-6/+20
|\ \ | |/ |/|
| * Camera: iterate through all encoders for finding max video sizeYin-Chia Yeh2015-03-311-6/+20
| | | | | | | | | | Bug: 19712132 Change-Id: I5c1fc748fcc756f6665c31951f8af8a37ff4254d
* | Merge "audio policy: fix IOProfile::isCompatibleProfile()"Eric Laurent2015-03-302-3/+11
|\ \
| * | audio policy: fix IOProfile::isCompatibleProfile()Eric Laurent2015-03-302-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle composite devices in IOProfile::isCompatibleProfile() by just checking the type in this case, not the address which is relevant only if a single device type is passed as input. Also remove warning. Bug: 19762960. Change-Id: Iaecb7fcfbf7ad39b1e33cb460922f7c069a34a00
* | | Merge "audio policy: fix DeviceVector::getDevicesFromType()"Eric Laurent2015-03-301-2/+6
|\ \ \
| * | | audio policy: fix DeviceVector::getDevicesFromType()Eric Laurent2015-03-261-2/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix device type comparison in DeviceVector::getDevicesFromType(): AUDIO_DEVICE_BIT_IN bit must be excluded from type comparison and used as an orthogonal match criterium. Change-Id: Ie7378723f5a3d613b1b045ccdda69650a9d655fc
* | | Merge "Camera: fix release fence logic"Yin-Chia Yeh2015-03-251-26/+9
|\ \ \
| * | | Camera: fix release fence logicYin-Chia Yeh2015-03-241-26/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | According to spec, HAL will set release_fence to acquire_fence when error happened (usually during flush call). Camera service should not refer to the acquireFence anyhow since per spec HAL needs to set it to -1 if acquireFence has been waited on. Change-Id: I809355d0c8c71f78f657e37d19221fd1f5bdc90b
* | | Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-252-12/+9
|\ \ \
| * | | Camera: fix metadata assertionYin-Chia Yeh2015-03-242-12/+9
| | | | | | | | | | | | | | | | | | | | Bug: 19897963 Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
* | | | Merge "AudioFlinger: call SPDIF wrapper from AudioFlinger"Phil Burk2015-03-2410-86/+688
|\ \ \ \
| * | | | AudioFlinger: call SPDIF wrapper from AudioFlingerPhil Burk2015-03-2410-86/+688
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create an interface layer between the AudioFlinger and the HAL that manages the wrapping and format conversion. Removed unnecessary includes. Handle rate conversion in getRenderPosition(). Try to open HAL with encoded format before wrapping with SPDIF. Bug: 17566660 Change-Id: I00ad888ca15ff0f85b85efb8167c7f5ea761a244 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | Merge "camera: update CameraModule"Yin-Chia Yeh2015-03-245-48/+65
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | camera: update CameraModuleChien-Yu Chen2015-03-245-48/+65
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add more accessor methods to CameraModule to prevent exposing raw module pointer 2. Use KeyedVector to replace array Bug: 19897963 Change-Id: I111cc093f09f5fb3c4b13693d5d0687e1f441058
* | | | Merge "AudioRecord TRANSFER_OBTAIN can be used with FAST flag"Glenn Kasten2015-03-241-2/+3
|\ \ \ \
| * | | | AudioRecord TRANSFER_OBTAIN can be used with FAST flagGlenn Kasten2015-03-231-2/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I001ba1a88150dddf79d99baf5927f31799745eef
* | | | | Merge "Make sure waitRelative is called when waitTime != INT64_MAX"Wally Yau2015-03-241-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make sure waitRelative is called when waitTime != INT64_MAXWally Yau2015-03-241-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/19870971 (cherry picked from commit c600af1459c455583e071e653f0d998032aa423e) Change-Id: Ic6bb54067d76c96ff6fc45431dc2d72db9f0a3a8
* | | | Merge "AudioFlinger: prevent retrograde timestamps for direct mode"Phil Burk2015-03-242-31/+51
|\ \ \ \
| * | | | AudioFlinger: prevent retrograde timestamps for direct modePhil Burk2015-03-232-31/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent retrograde motion in the HAL or drivers from making it up through the AudioFlinger to the app. Bug: 19604395 Change-Id: I11d6c0f7cab69e75fd4b4a2a90f64960b4bb6d5a Signed-off-by: Phil Burk <philburk@google.com>
* | | | | Merge "media: add ResourceManagerService"Ronghua Wu2015-03-245-0/+958
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | media: add ResourceManagerServiceRonghua Wu2015-03-235-0/+958
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 19620911 Change-Id: Iea173d310d31781bc50effe3d9bd6553cb5139eb
* | | | Merge "Fix typos"Glenn Kasten2015-03-231-1/+1
|\ \ \ \
| * | | | Fix typosGlenn Kasten2015-03-231-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in comments Add formal parameter name to declaration where it was missing Fix out of order comments Change-Id: I1de81ae82af5ca507864e4c7b959111bac898b98
* | | | camera2: Remove ProCamera.Ruben Brunk2015-03-208-667/+2
|/ / / | | | | | | | | | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* | | Merge "Enable full floating point path in AudioMixer"Andy Hung2015-03-201-3/+3
|\ \ \ | |/ / |/| |
| * | Enable full floating point path in AudioMixerAndy Hung2014-11-071-3/+3
| | | | | | | | | | | | Change-Id: I7becce859d6e8db413e6a7c3193ae0f2af273599