summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* audio policy: add option to use new policy managerEric Laurent2014-03-188-218/+997
| | | | | | | | | | | | | | | | | Add build option USE_LEGACY_AUDIO_POLICY to use either new audio policy manager in local AudioPolicyManager.cpp or the legacy AudioPolicyManagerBase.cpp via the policy HAL. New features will be implemented only by the new audio policy manager. Platform customiization will be by config file or new policy HAL. AudioPolicyClientImplLegacy.cpp copied from AudioPolicyClientImpl.cpp AudioPolicyInterfaceImplLegacy.cpp copied from AudioPolicyInterfaceImpl.cpp New implementations of AudioPolicyInterface and AudioPolicyClient talking directly to AudioPolicyManager. Change-Id: I7a320883a1de13de2c9295343e996addf2f3c154
* Merge "audio policy: renamed AudioPolicyManagerBase to AudioPolicyManager"Eric Laurent2014-03-182-158/+153
|\
| * audio policy: renamed AudioPolicyManagerBase to AudioPolicyManagerEric Laurent2014-03-112-158/+153
| | | | | | | | Change-Id: Ia8b5ae9c3a9cf6ed98f162614ea331efc78e9ff2
* | Merge "audio policy: remove dependency from AudioSystemLegacy"Eric Laurent2014-03-183-243/+252
|\ \ | |/
| * audio policy: remove dependency from AudioSystemLegacyEric Laurent2014-03-113-243/+252
| | | | | | | | | | | | | | | | Remove all dependencies on AudioSystemLegacy from AudioPolicyManagerBase. Only use types and definitions from audio.h and audio_policy.h. Also move code back into android name space. Change-Id: I0c2582cf854027fb1e599981865a6cbe7b5a9490
* | Merge "audio policy: import audio policy manager from hardware legacy"Eric Laurent2014-03-183-0/+4939
|\ \ | |/
| * audio policy: import audio policy manager from hardware legacyEric Laurent2014-03-113-0/+4939
| | | | | | | | | | | | | | Import AudioPolicyManagerBase from hardware/libhardware_legacy to prepare move from android_audio_legacy name space. Change-Id: I5d6682ccd2bfdeefbf2f6f81a557480a76aaf4fc
* | Merge "audio policy: split implementation"Eric Laurent2014-03-184-642/+784
|\ \ | |/
| * audio policy: split implementationEric Laurent2014-03-114-642/+784
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split audio policy service implementation to ease further evolution: AudioPolicyInterfaceImpl.cpp contains the implementation of IAudioPolicyService interface AudioPolicyClientImpl.cpp contains the implementation of the AudioPolicyManager client interface AudioPolicyService.cpp contains the rest of the code mostly command threads implementation and pre processing management. AudioPolicyService.cpp: Change-Id: Ic48ba165532ef66e84a30894d01f750ed6619d02
* | am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null ↵Igor Murashkin2014-03-181-0/+10
|\ \ | | | | | | | | | | | | | | | | | | availability listener * commit '557847ee511dd5e75d584ff04449322f0f098241': camera2: Fix segfault when using null availability listener
| * \ am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability ↵Igor Murashkin2014-03-181-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | listener * commit 'a6ca0acf0d009acf45b05561273aaad44ab22533': camera2: Fix segfault when using null availability listener
| | * \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'bd3e2e03f3ab686c52982a9e50cae853128172cf': camera2: Fix segfault when using null availability listener
| | | * | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICameraService::addListener / removeListener will now return BAD_VALUE if a null listener is used. Bug: 12891434 Change-Id: I9764110094d8fd42e22fcc8df3ef0e73c1b070e7
* | | | | Merge "move audio policy service to a separate library"Eric Laurent2014-03-184-3/+43
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | move audio policy service to a separate libraryEric Laurent2014-03-114-3/+43
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibc3ef07aa9860b7fd4f9aaff27b0dbe0dcbf1cbf
* | | | | camera3: Remove old vendor tag ops dependencies.Ruben Brunk2014-03-172-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I7acdf76d4c0674bdb1cc939592d4620687c785c3
* | | | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
* | | | | Make error handling more similar for output and captureGlenn Kasten2014-03-142-40/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And simplify error case Change-Id: I0bb1ec252945d672cc4cef137977b912f1b23d51
* | | | | Make error handling for audio driver initCheck more similarGlenn Kasten2014-03-141-8/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I8222f00f7ac89d52235af0f64f3fee7a8c471e1e
* | | | | Make session ID code similar between output and captureGlenn Kasten2014-03-141-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I873a97d0e36e1a452421df4f749d51e1916797a5
* | | | | Move declarations to where neededGlenn Kasten2014-03-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove unnecessary ALOGV and dead variable inFrameCount Change-Id: I34547fb0fd2ff142fc60277bedfa4064e7356611
* | | | | Remove name output parameter from createTrackGlenn Kasten2014-03-142-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used for one log. A better solution will be a per-track unique ID. Change-Id: Ia440e02ae4a5a4019a9a2d08970e1ee93ac4c3a3
* | | | | Replace if/else by switchGlenn Kasten2014-03-141-3/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe96c8fb1f0ba7f850c0561f60769ce63aceba5d
* | | | | Whitespace and commentsGlenn Kasten2014-03-143-5/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I99752cca74a459c4746ea4718acb0115439e50bd
* | | | | Prepare for additional capture formatsGlenn Kasten2014-03-141-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib10b004f0029191b33a97671e41b0d86ebfbe0b9
* | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-143-0/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-143-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| | * | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-123-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
| | * | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger enters a deadlock (with itself) on trying to free a RecordTrack or Track object that failed initialization. Clear this bad object from the caller instead. Bug: 12423233 Change-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16
| * | | | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ↵Zhijun He2014-03-111-0/+16
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | preview size is changed * commit 'f0fb921c0170fe3b8ebce8fbe3c133a99c6def9f': DO NOT MERGE: Camera: delete preview callback when preview size is changed
| | * | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ↵Zhijun He2014-03-111-0/+16
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | is changed * commit 'bc69c8ba9a8fc881603669205a56d0ca1b572a95': DO NOT MERGE: Camera: delete preview callback when preview size is changed
| | | * | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview callback stream is left configured even the preview size is changed. This makes the callback stream unnecessarily configured even in recording mode, which could cause distorted preview for some devices. Bug: 12210027 Bug: 12591410 Change-Id: If50cddfe5562e91aec1feb1760eccb82ddb21730
| * | | | | am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into ↵Eino-Ville Talvala2014-03-073-55/+66
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '47ef192f0296642b901e82d0c72c5a1a0d08f4df': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | * | | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | | * | | Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | | | * | | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12304559 Change-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0
| | | | * | | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11856804 - Shutdown order in Camera2Client allows a stream to be deleted before the corresponding processing thread has quit. This can result in updates being called on the processor thread without a valid stream. Change-Id: Ie4e649771f4321498659211f2a37ed89a6d956c4
| | | | * | | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jpeg stream in JpegProcessor could be deleted while process new capture is ongoing, which unsafe to access a dead consumer endpoint. Bug: 9316454 Change-Id: I2950f31ea28d0ba01f08502e2e3ba452bf8bb818
| | | * | | | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-051-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11967381 Change-Id: Iedec06280aa745d9df5d661f4916940cede9c191
| | * | | | | am 281dd4e1: audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '281dd4e13309973dbb85bce531f884237e0d8fb0': audioflinger: fix static track end detection
| | | * | | | audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a static track is not a fast track, prepareTracks_l() must rely on framesReady() to detect end of buffer and remove the track from the active track list. Failing to do so results in the track staying active but not processed by the mixer because in underrun. This leaves the mix buffer content uninitialized and causes the effect process function to accumulate its output onto undefined data. Bug: 12013676. Change-Id: I4b0819a9d93141ac3307b8786fc6a451dd585220
| | | * | | | AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-03-051-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If any track goes through AudioMixer::process__genericNoResampling, and its getnextbuffer returns NULL, Then that track is removed by AudioMixer from enabledTracks. Thus if all tracks getnextbuffer return NULL, Then this function doesn't reset outTemp and last buffer in AudioFlinger's mMixBuffer will be repeated and noise is observed. Remove tracks from enabledTracks after reseting outTemp to zero, so that process__genericNoResampling will reset outTemp and noise won't appear. Bug: 12450065 Change-Id: I28996d425838728955f01eb1a00acf6e6dc2dea1 Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com> Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
| * | | | | | am eb16bb5d: am 7028a2c8: am 7e92abea: audioflinger: fix offload write ↵Eric Laurent2014-03-051-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer offset * commit 'eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc': audioflinger: fix offload write buffer offset
| | * | | | | am 7e92abea: audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '7e92abeafb184e8a34213d7149592e95a72601b0': audioflinger: fix offload write buffer offset
| | | * | | | audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix current audio HAL write buffer offset calculation which assumes that the frame size is a multiple of 2. ' Bug: 12823725. Change-Id: I0195ed5cfef225a6f114e7dd405a02680bb7254e
| | | * | | audioflinger: check for condition before waitingHaynes Mathew George2014-03-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AsyncCallbackThread must check for any condition that was already been satisfied before waiting. Bug: 11824817 Change-Id: I04683a1f355de4f440106cab47fd916aa39d5e35
| * | | | | am 632c3790: am 7c206e5b: am e0cd1051: audioflinger: update track ready ↵Haynes Mathew George2014-03-051-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition * commit '632c3790523896260dc43fd6cd40a158765cdb15': audioflinger: update track ready condition
| | * | | | am e0cd1051: audioflinger: update track ready conditionHaynes Mathew George2014-03-051-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'e0cd1051ed9fea0629745c29020516ae62298461': audioflinger: update track ready condition
| | | * | | audioflinger: update track ready conditionHaynes Mathew George2014-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signal track ready if the track isStopping(). Bug: 12423190 Change-Id: I95e14905df10ebf301e398263478c8ca25d7e2ce
| * | | | | am 4f9e38c6: am 21e81bca: am e010f65e: audioflinger: Fix for a deadlock in ↵Haynes Mathew George2014-03-052-2/+6
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | | | | | | | | | | track creation * commit '4f9e38c60cc79407a8b2966b3b9780a3e395b017': audioflinger: Fix for a deadlock in track creation