summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | am e010f65e: audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-052-2/+6
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'e010f65e6337267cb15f8894c950a3f64370dd36': audioflinger: Fix for a deadlock in track creation
| | | * audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-042-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Fix Offload playback in AudioFlinger"Andy Hung2014-03-141-2/+3
|\ \ \ \
| * | | | Fix Offload playback in AudioFlingerAndy Hung2014-03-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Offload playback regression introduced by adding flexible format to mSinkBuffer. Test case is AAC file playback. Bug: 13450717 Change-Id: I0fa11978295ed4793be90c565e5b8abedf156914 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Merge "Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format"""Andy Hung2014-03-142-22/+41
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format""Andy Hung2014-03-132-22/+41
| | | | | | | | | | | | | | | | | | | | This reverts commit e2a9c29f35e0c09782558542fc4cf9823779590e.
* | | | | Merge "camera3: Pass vendor tags through binder."Ruben Brunk2014-03-135-49/+111
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | camera3: Pass vendor tags through binder.Ruben Brunk2014-03-135-49/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 - Adds a class for parceling vendor tag definitions. - Passes vendor tag definitions to clients of the camera service. - Switches over to new vendor tag mechanism when reading from HAL. Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
* | | | | Revert "Convert AudioFlinger mSinkBuffer to flexible format"Eric Laurent2014-03-132-41/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e7e676fd2866fa4898712c4effa9e624e969c182. Bug: 13450717. Change-Id: Ib80b0d14428fecce33c62003a1fcf83f71cee03b
* | | | | Convert AudioFlinger mSinkBuffer to flexible formatAndy Hung2014-03-102-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I618d9c99a5f6f8c8d6a9f4b2d19e82c9ddc3b06e Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Add mEffectBuffer to AudioFlingerAndy Hung2014-03-102-21/+110
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf97c50040bc127723d56eb4d2fb6e790a7253d9 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | NBAIO::Format_from_SR_C requires audio_format_t parameterGlenn Kasten2014-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4b65f6ed2f6ca3608b3a5f88f52a93af0b9b1f4a
* | | | | Merge "Use larger capture pipe since we support resampling by 6:1"Glenn Kasten2014-03-061-3/+3
|\ \ \ \ \
| * | | | | Use larger capture pipe since we support resampling by 6:1Glenn Kasten2014-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids overruns on the client AudioRecord side, without requiring client to use a large buffer. It should not increase input latency, since a newly started AudioRecord always joins the stream starting at the latest data. Change-Id: Ib2b8de75cc40a6a3d493a1f8b46b41220f69264f
* | | | | | Rename mSinkFormat to mMixerFormat for AudioMixer::track_tAndy Hung2014-03-013-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioMixer::SINK_FORMAT also changes to AudioMixer::MIXER_FORMAT Change-Id: Ic3f8be77d2c75c082c4fd140bc907e30c304d285 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge "Use float_from_q19_12 conversion in AudioMixer"Andy Hung2014-03-011-3/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use float_from_q19_12 conversion in AudioMixerAndy Hung2014-02-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbe84fb9610c7e636a84468f2e2402a913435ca9 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge "Add MixerBuffer for accumulation of float audio"Andy Hung2014-02-282-10/+113
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add MixerBuffer for accumulation of float audioAndy Hung2014-02-272-10/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Path into and out of MixerBuffer is set up, but not currently enabled. Change-Id: I9d50752607d22dd2a3d9cc7e053babf8dfb22958 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge "Rename mixBufferSize to mSinkBufferSize in AudioFlinger"Andy Hung2014-02-282-11/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Rename mixBufferSize to mSinkBufferSize in AudioFlingerAndy Hung2014-02-272-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d1d18d716fa3ad8c0e7cc87f5a2823422f504eb Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge "Rename constants for MixBufferSize to SinkBufferSize"Andy Hung2014-02-281-9/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Rename constants for MixBufferSize to SinkBufferSizeAndy Hung2014-02-271-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated variable names are kMinNormalSinkBufferSizeMs kMaxNormalSinkBufferSizeMs Change-Id: I91969eae3f8c10275db8778634cbf05fdec0712b Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge "Rename mMixBuffer to mSinkBuffer in AudioFlinger"Andy Hung2014-02-282-27/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Rename mMixBuffer to mSinkBuffer in AudioFlingerAndy Hung2014-02-272-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f55630425b8ce36e9df2aaf64e06a8960b69a47 Signed-off-by: Andy Hung <hunga@google.com>
generated by cgit v1.1 at 2024-05-29 01:09:31 +0000