OSDN Git Service
Zhijun He [Wed, 25 Sep 2013 23:56:08 +0000 (16:56 -0700)]
am
6914de6d: Merge "Camera: Implement getCameraCharacteristics" into klp-dev
* commit '
6914de6dd1d74fcf74e3247c89f9293fbf7bafe5':
Camera: Implement getCameraCharacteristics
Zhijun He [Wed, 25 Sep 2013 23:52:06 +0000 (23:52 +0000)]
Merge "Camera: Implement getCameraCharacteristics" into klp-dev
Zhijun He [Wed, 25 Sep 2013 17:14:30 +0000 (10:14 -0700)]
Camera: Implement getCameraCharacteristics
Bug:
10904541
Bug:
10360518
Change-Id: Ie9ca6b3b0b5f2fe529e6b0decc193096e770a017
Eric Laurent [Wed, 25 Sep 2013 20:05:50 +0000 (13:05 -0700)]
am
1802399c: Merge "fix deadlock in audioflinger::createEffect()" into klp-dev
* commit '
1802399c7c4d8557922688f246df292703f417f1':
fix deadlock in audioflinger::createEffect()
Eric Laurent [Wed, 25 Sep 2013 20:01:01 +0000 (20:01 +0000)]
Merge "fix deadlock in audioflinger::createEffect()" into klp-dev
Eric Laurent [Wed, 25 Sep 2013 19:25:29 +0000 (12:25 -0700)]
fix deadlock in audioflinger::createEffect()
commit
5baf2af5 introduced a regression by calling
getOutputForEffect() with AudioFLinger main mutex locked.
The locking order must always be AudioPolicyService mutex then
AudioFlinger then ThreadBase mutex.
Bug:
10916796.
Change-Id: Ide34a2d84dbb06dbb35abd0640d91b01b0ac4d40
Eino-Ville Talvala [Wed, 25 Sep 2013 19:29:27 +0000 (12:29 -0700)]
am
2b890936: Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into klp-dev
* commit '
2b890936e978de0a8d4450ee1aaeda53d22b5f4e':
Camera2/3: Support new PASSIVE_UNFOCUSED AF state
Eino-Ville Talvala [Wed, 25 Sep 2013 19:27:34 +0000 (19:27 +0000)]
Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into klp-dev
Chong Zhang [Wed, 25 Sep 2013 17:31:44 +0000 (10:31 -0700)]
am
58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before first access unit" into klp-dev
* commit '
58dd07863571951408b67fa0a7f17cb23606fb1c':
Send kWhatConnected in onTimeUpdate() before first access unit
Chong Zhang [Wed, 25 Sep 2013 17:27:15 +0000 (17:27 +0000)]
Merge "Send kWhatConnected in onTimeUpdate() before first access unit" into klp-dev
Lajos Molnar [Wed, 25 Sep 2013 17:16:13 +0000 (10:16 -0700)]
am
6c63fe0f: am
ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"
* commit '
6c63fe0fdb33e5e7eb8c89f2420262b072cdd83f':
MediaCodec: Pass the crop rect to SoftwareRenderer
Lajos Molnar [Wed, 25 Sep 2013 17:14:22 +0000 (10:14 -0700)]
am
ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"
* commit '
ab70649e2b0ea3d917242814417ec5711f4cb811':
MediaCodec: Pass the crop rect to SoftwareRenderer
Lajos Molnar [Wed, 25 Sep 2013 17:12:12 +0000 (17:12 +0000)]
Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"
Martin Storsjo [Wed, 25 Sep 2013 13:26:09 +0000 (16:26 +0300)]
MediaCodec: Pass the crop rect to SoftwareRenderer
Change-Id: I434411516eb5fafe9d7aeac9882bbc7f1a8415d8
Jean-Michel Trivi [Tue, 24 Sep 2013 23:43:32 +0000 (16:43 -0700)]
am
d2ac3144: Merge "Fix log typos in Visualizer effect" into klp-dev
* commit '
d2ac3144e201398340cc5b9bb36e5efe39edd9eb':
Fix log typos in Visualizer effect
Jean-Michel Trivi [Tue, 24 Sep 2013 23:37:53 +0000 (23:37 +0000)]
Merge "Fix log typos in Visualizer effect" into klp-dev
Eric Laurent [Tue, 24 Sep 2013 22:44:12 +0000 (15:44 -0700)]
am
ddfbfaeb: fix oflload effect proxy commmand handling
* commit '
ddfbfaeb00295fff7351711f0f044f17d6c40f3c':
fix oflload effect proxy commmand handling
Jean-Michel Trivi [Tue, 24 Sep 2013 22:31:13 +0000 (15:31 -0700)]
Fix log typos in Visualizer effect
Fix errors in logs for Visualizer.
Set loop counters on 32 bits
Bug
8413913
Change-Id: Iad2140d003d15d45be46826a5e89baff14fe9e77
Eric Laurent [Fri, 20 Sep 2013 19:27:32 +0000 (12:27 -0700)]
fix oflload effect proxy commmand handling
Implement a more generic command handling in offload effect
proxy. All commands are sent to both sub effects but only the reply
from the active one is returned to the caller.
Bug:
8174034.
Change-Id: Ia45f9933b3bf338257ec70b37732fa1578d26b9f
Eric Laurent [Tue, 24 Sep 2013 21:08:21 +0000 (14:08 -0700)]
am
1c7f35d1: Merge "soundpool: allocate shared memory heap by client" into klp-dev
* commit '
1c7f35d1f25eb7160314fdef536463fc34deb1ea':
soundpool: allocate shared memory heap by client
Eric Laurent [Tue, 24 Sep 2013 21:05:13 +0000 (21:05 +0000)]
Merge "soundpool: allocate shared memory heap by client" into klp-dev
Eino-Ville Talvala [Tue, 24 Sep 2013 20:32:12 +0000 (13:32 -0700)]
am
1ecd3dc4: Merge "Camera2/3: Properly disambiguate FPS range vs. single FPS setting" into klp-dev
* commit '
1ecd3dc4c779754e9d6603a17b9b3c6b709fb0cc':
Camera2/3: Properly disambiguate FPS range vs. single FPS setting
Eino-Ville Talvala [Tue, 24 Sep 2013 20:29:55 +0000 (20:29 +0000)]
Merge "Camera2/3: Properly disambiguate FPS range vs. single FPS setting" into klp-dev
Eric Laurent [Tue, 24 Sep 2013 16:53:27 +0000 (09:53 -0700)]
soundpool: allocate shared memory heap by client
Current SoundPool implementation allocates the shared memory heap
containing decoded PCM samples in mediaserver process.
When mediaserver process crashes, the shared memory heaps allocated by
AudioCache cannot be mapped anymore in the new instance of mediaserver.
This causes a silent failure to end playback of new sounds because
AudioFlinger believes the new AudioTracks are opened in streaming mode
and not static mode: it sees a NULL shared memory pointer when the track
is created.
The fix consists in allocating the memory heap in the client process. Thus
the heap is not lost when mediaserver restarts. The global memory usage is
the same as this is shared memory.
Also added a way to detect that a shared memory is passed when the track is
created but cannot be mapped on mediaserver side.
Also fix a crash in SoundPool when ALOGV is enabled.
Bug:
10894793.
Change-Id: Ice6c66ec3b2a409d75dc903a508b6c6fbfb2e8a7
Eric Laurent [Tue, 24 Sep 2013 17:54:13 +0000 (10:54 -0700)]
am
664539d2: audioflinger: fix ro.audio.silent in offload again
* commit '
664539d25180ab8f77e0521533ea2821cf28985f':
audioflinger: fix ro.audio.silent in offload again
Chong Zhang [Tue, 24 Sep 2013 17:04:42 +0000 (10:04 -0700)]
Send kWhatConnected in onTimeUpdate() before first access unit
Bug:
10642588
Change-Id: If2b4fbbf250d5307e304f31c7aa4ac480e279484
Jean-Michel Trivi [Tue, 24 Sep 2013 02:00:19 +0000 (19:00 -0700)]
am
402dfba6: Merge "Add support for level measurements in Visualizer" into klp-dev
* commit '
402dfba6dcd68f5fd8d8921f9751f3e47eb1449d':
Add support for level measurements in Visualizer
Eric Laurent [Tue, 24 Sep 2013 02:00:13 +0000 (19:00 -0700)]
am
1d2536f4: Merge "AudioTrack: fix music resume" into klp-dev
* commit '
1d2536f460d4678770f423f50cbf6a61a13d4d11':
AudioTrack: fix music resume
Eric Laurent [Tue, 24 Sep 2013 01:59:32 +0000 (18:59 -0700)]
am
21e54568: fix incoming call audio start time.
* commit '
21e5456821e3c107d09b0629adbf23c9e06e7c0b':
fix incoming call audio start time.
Eric Laurent [Tue, 24 Sep 2013 01:24:31 +0000 (18:24 -0700)]
audioflinger: fix ro.audio.silent in offload again
Commit
1abbdb4 was not working 100% of the times because
it is possible that the offload thread loop never sleeps
after being created in which case the property is never read.
The loop now reads the property once when starting.
Bug:
10899309.
Change-Id: I2e2ca332f2d7086e59d65f6010378c4d9618ba9e
Jean-Michel Trivi [Mon, 23 Sep 2013 22:58:33 +0000 (22:58 +0000)]
Merge "Add support for level measurements in Visualizer" into klp-dev
Jean-Michel Trivi [Fri, 20 Sep 2013 18:58:40 +0000 (11:58 -0700)]
Add support for level measurements in Visualizer
New commands to set a measurement mode and perform peak + RMS
measurements.
Bug
8413913
Change-Id: Ib25254065c79d365ebb34f9dc9caa0490e2d300d
Eric Laurent [Mon, 23 Sep 2013 22:15:37 +0000 (22:15 +0000)]
Merge "AudioTrack: fix music resume" into klp-dev
Eric Laurent [Mon, 23 Sep 2013 19:08:05 +0000 (12:08 -0700)]
fix incoming call audio start time.
commit
cec4abb fixing issue
6720482 had a flaw that
would insert commmands at the wrong position in the
audio policy service command thread queue causing other
commands to be delayed more than expected.
A change in track stop timing introduced by commit
bfb1b83
made this issue visible when answering a call.
Bug:
10860012.
Change-Id: Iec769112f14e13d13b64628b808e43663e33771c
Eric Laurent [Mon, 23 Sep 2013 19:29:42 +0000 (12:29 -0700)]
AudioTrack: fix music resume
Fix regression introduced by commit
5a6cd22 in AudioTrack resume:
the callback thread was not signaled if paused internaly.
Bug:
10895013.
Change-Id: Ic356b115132d6fccbcee2d9bb855e92671dc20c5
Eino-Ville Talvala [Sat, 21 Sep 2013 00:21:18 +0000 (17:21 -0700)]
Camera2/3: Support new PASSIVE_UNFOCUSED AF state
Bug:
10860639
Change-Id: I39be64abaf79b49b2d1f74e1c2ab2adf718ae701
Eino-Ville Talvala [Fri, 20 Sep 2013 23:32:26 +0000 (16:32 -0700)]
Camera2/3: Properly disambiguate FPS range vs. single FPS setting
The camera1 API allows for either setPreviewFrameRate or
setPreviewFPSRange, so both values may or may not change in a single
setParameter call.
The disambiguation of which setting has been changed since the last
setParameter() call was not fully correct, so a sequence of changes
that only changed setPreviewFPSRange or didn't change either could be
interpreted as as a change to setPreviewFrameRate.
Bug:
10842868
Change-Id: I40baeced80a58f09f8a1742ece8dd5e141e9c1e3
Glenn Kasten [Fri, 20 Sep 2013 22:08:27 +0000 (15:08 -0700)]
am
4b701cc0: Merge "Revert "Workaround slow AudioTrack destruction"" into klp-dev
* commit '
4b701cc041d635e5ec56e382043a4c5d01aedd80':
Revert "Workaround slow AudioTrack destruction"
Glenn Kasten [Fri, 20 Sep 2013 22:05:38 +0000 (22:05 +0000)]
Merge "Revert "Workaround slow AudioTrack destruction"" into klp-dev
Glenn Kasten [Fri, 20 Sep 2013 21:04:05 +0000 (14:04 -0700)]
am
3b3cfcfa: Merge "Fix slow AudioTrack and AudioRecord destruction" into klp-dev
* commit '
3b3cfcfa272c8e3e16c89765b8817f5a8de0c505':
Fix slow AudioTrack and AudioRecord destruction
Glenn Kasten [Fri, 20 Sep 2013 21:01:35 +0000 (21:01 +0000)]
Merge "Fix slow AudioTrack and AudioRecord destruction" into klp-dev
Glenn Kasten [Fri, 20 Sep 2013 16:20:45 +0000 (09:20 -0700)]
Fix slow AudioTrack and AudioRecord destruction
There were two causes for the slowness:
When thread was paused, it used nanosleep and sleep. These usually
run to completion (except for POSIX signal, which we avoid because it
is low-level). Instead, replace the nanosleep and sleep by condition
timed wait, as that can be made to return early by a condition signal.
Another advantage of condition timed wait is that a condition wait was
already being used at top of thread loop, so it is a simpler change.
The AudioRecord destructor was missing a proxy interrupt that was correct
in AudioTrack. This proxy interrupt is needed in case another thread
is blocked in proxy obtainBuffer.
Does not address the 1 second polling for NS_WHENEVER.
Bug:
10822765
Change-Id: Id665994551e87e4d7da9c7b015f424fd7a0b5560
Glenn Kasten [Fri, 20 Sep 2013 18:12:06 +0000 (18:12 +0000)]
Revert "Workaround slow AudioTrack destruction"
This reverts commit
8bbbd7da02fac3de40139af19f7cf7a7cc3cc824.
Change-Id: I269a6c445cbce33451b6a9e74223e36e6abbdbe0
Eino-Ville Talvala [Fri, 20 Sep 2013 18:04:24 +0000 (11:04 -0700)]
am
291a09c3: Merge "Camera2/3: For still captures, use widest FPS range available." into klp-dev
* commit '
291a09c3537f2160ec2f1cac16a22212304c2cbf':
Camera2/3: For still captures, use widest FPS range available.
Eino-Ville Talvala [Fri, 20 Sep 2013 17:59:44 +0000 (17:59 +0000)]
Merge "Camera2/3: For still captures, use widest FPS range available." into klp-dev
Eino-Ville Talvala [Fri, 20 Sep 2013 17:12:32 +0000 (10:12 -0700)]
Camera2/3: For still captures, use widest FPS range available.
Instead of using the application-selected preview FPS range for still
captures, select the widest FPS range advertised by the device and use
it for still captures instead, to give the HAL the widest range of exposure
values to choose from possible.
Bug:
10842868
Change-Id: I0e24f5eb713a4f8df116cd5979a84390cc0974d7
Eric Laurent [Fri, 20 Sep 2013 16:58:22 +0000 (09:58 -0700)]
am
a3b97ad2: Merge "audioflinger: implement getTimestamp() for offloaded tracks" into klp-dev
* commit '
a3b97ad288e6808c54c6275eaac1bd53108d8f11':
audioflinger: implement getTimestamp() for offloaded tracks
Eric Laurent [Fri, 20 Sep 2013 16:56:33 +0000 (16:56 +0000)]
Merge "audioflinger: implement getTimestamp() for offloaded tracks" into klp-dev
Eric Laurent [Fri, 20 Sep 2013 16:36:34 +0000 (09:36 -0700)]
audioflinger: implement getTimestamp() for offloaded tracks
Bug:
9587132.
Change-Id: Ie9d5f4cca96306d08bc9a2dbd6edd8953096702d
Eric Laurent [Fri, 20 Sep 2013 00:50:07 +0000 (17:50 -0700)]
am
fbb2609f: Merge "audioflinger: fix lost offload thread resume event" into klp-dev
* commit '
fbb2609f132f23a983d376dec9ae6bfebfcacc4c':
audioflinger: fix lost offload thread resume event
Eric Laurent [Fri, 20 Sep 2013 00:48:39 +0000 (00:48 +0000)]
Merge "audioflinger: fix lost offload thread resume event" into klp-dev
Eric Laurent [Thu, 19 Sep 2013 21:37:46 +0000 (14:37 -0700)]
audioflinger: fix lost offload thread resume event
It was possible that a resume request signaled by addTrack_l()
while waiting for an async write callback is lost. This is because
mSignalPending was not set and waitingAsyncCallback_l() would pause the
thread loop before executing prepareTracks_l().
The fix consists in using signal_l() method to wake the thread
loop o that mSignalPending is set.
Also make sure that sleepTime is reset to 0 when resuming to make sure
that we write any remaining bytes to the HAL.
Bug:
10810347.
Change-Id: If9a3b22cc3b9e6eb384a56c48c40e6258d0896ad
Andy McFadden [Thu, 19 Sep 2013 21:28:07 +0000 (14:28 -0700)]
am
cfca686a: Merge "Rotate fallback size" into klp-dev
* commit '
cfca686ae8e64bda44a370232f3ba367e6e520d1':
Rotate fallback size
Andy McFadden [Thu, 19 Sep 2013 21:23:28 +0000 (21:23 +0000)]
Merge "Rotate fallback size" into klp-dev
Andy McFadden [Thu, 19 Sep 2013 18:08:33 +0000 (11:08 -0700)]
Rotate fallback size
If configuring the encoder for display-size recording fails, we drop
back to 720p. This was done a bit too literally, and didn't look
good in portrait mode. Rotate the fallback size as needed.
Bug
10826876
Change-Id: Id3130471fc1467afa8bf91d75c9d4a49245253c3
Igor Murashkin [Thu, 19 Sep 2013 17:11:03 +0000 (10:11 -0700)]
am
b5bca3ff: Merge "camera2: Tell all streams to ignore global device UI rotation" into klp-dev
* commit '
b5bca3ff7784ce95431224482ec42a50261e04b2':
camera2: Tell all streams to ignore global device UI rotation
Igor Murashkin [Thu, 19 Sep 2013 17:09:02 +0000 (17:09 +0000)]
Merge "camera2: Tell all streams to ignore global device UI rotation" into klp-dev
Glenn Kasten [Thu, 19 Sep 2013 16:30:09 +0000 (09:30 -0700)]
am
feb6d27b: Merge "Workaround slow AudioTrack destruction" into klp-dev
* commit '
feb6d27bf61cd266cf753215e9cae16b9bc9dbbd':
Workaround slow AudioTrack destruction
Glenn Kasten [Thu, 19 Sep 2013 16:28:23 +0000 (16:28 +0000)]
Merge "Workaround slow AudioTrack destruction" into klp-dev
Eric Laurent [Thu, 19 Sep 2013 15:33:18 +0000 (08:33 -0700)]
am
d1b28d41: audioflniger: fix leaked audiosession references
* commit '
d1b28d41dbda203ffb420ba2e36cbe736b163ff8':
audioflniger: fix leaked audiosession references
Igor Murashkin [Wed, 18 Sep 2013 00:03:28 +0000 (17:03 -0700)]
camera2: Tell all streams to ignore global device UI rotation
- Also use android.sensor.orientation to set the right transform
flags automatically.
Bug:
10804238
Change-Id: I10caf8331f19e107c461696963cc10f597c91d83
Eric Laurent [Thu, 19 Sep 2013 01:47:13 +0000 (18:47 -0700)]
audioflniger: fix leaked audiosession references
acquireAudioSessionId() should not create session references
if the caller is not listed in the known notification clients.
It happens when the MediaPlayer or AudioTrack is created by the
mediaserver on behalf of a client (e.g CameraService). In this case
releaseAudioSessionId() can be called from a different pid and
the session reference will not be removed.
Also we will not be able to remove the reference if the client
process dies.
Bug:
10606426.
Change-Id: Ibb5e27518daeb484a2e66302e4c6221cbaca5b70
Glenn Kasten [Wed, 18 Sep 2013 21:15:42 +0000 (14:15 -0700)]
Workaround slow AudioTrack destruction
Bug:
10809586
Change-Id: I5f30d4deb1233e8ade8967568e40684ef680c395
Eric Laurent [Wed, 18 Sep 2013 20:59:16 +0000 (13:59 -0700)]
am
5baf2af5: more support for audio effect offload
* commit '
5baf2af52cd186633b7173196c1e4a4cd3435f22':
more support for audio effect offload
Eric Laurent [Fri, 13 Sep 2013 00:37:00 +0000 (17:37 -0700)]
more support for audio effect offload
Offloading of audio effects is now enabled for offloaded
output threads. If an effect not supporting offload is enabled,
the AudioTrack is invalidated so that it can be recreated in PCM
mode.
Fix some issues in effect proxy related to handling of effect
commands to offloaded and non offloaded effects.
Also fixed a bug on capture index in software Visualizer effect.
Bug:
8174034.
Change-Id: Ib23d3c2d5a652361b0aaec7faee09102f2b18fce
Glenn Kasten [Wed, 18 Sep 2013 17:59:17 +0000 (10:59 -0700)]
am
9a98b6de: Merge "Partial fix for SoundPool not terminating" into klp-dev
* commit '
9a98b6de791aeb130192df10744f5b35f8b6ef1a':
Partial fix for SoundPool not terminating
Glenn Kasten [Wed, 18 Sep 2013 17:56:05 +0000 (17:56 +0000)]
Merge "Partial fix for SoundPool not terminating" into klp-dev
Glenn Kasten [Wed, 18 Sep 2013 17:33:39 +0000 (10:33 -0700)]
Partial fix for SoundPool not terminating
SoundPool was waiting for EVENT_UNDERRUN only to indicate end of clip. In
J, AudioTrack delivered both EVENT_UNDERRUN followed by EVENT_BUFFER_END.
However, as of K, AudioTrack is only delivering EVENT_BUFFER_END (this
lack of EVENT_UNDERRUN is another bug which still needs to be fixed).
The workaround is to also respond to EVENT_BUFFER_END in SoundPool.
Bug:
10787103
Change-Id: Id68a23bddd6dd9df6c49c55138197260d71ca468
Lajos Molnar [Wed, 18 Sep 2013 17:33:55 +0000 (10:33 -0700)]
am
ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value" into klp-dev
* commit '
ab6c93b4bea96dc4f44a7acfefee1e11a3abda5b':
Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value
Lajos Molnar [Wed, 18 Sep 2013 17:31:18 +0000 (17:31 +0000)]
Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value" into klp-dev
Lajos Molnar [Wed, 18 Sep 2013 02:07:40 +0000 (19:07 -0700)]
Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value
Change-Id: I157bcafbf705865e66c81517b1eab10c3daa039e
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10461617
Jean-Michel Trivi [Wed, 18 Sep 2013 01:49:48 +0000 (18:49 -0700)]
am
6cc3a994: LoudnessEnhancer audio effect implementation
* commit '
6cc3a9948b51193dfdcb0c3527d7f3d1ca38aa3c':
LoudnessEnhancer audio effect implementation
Jean-Michel Trivi [Tue, 10 Sep 2013 16:15:18 +0000 (09:15 -0700)]
LoudnessEnhancer audio effect implementation
Implementation based on DRC effect, controlled by a
target gain.
The target gain is used to amplify the signal at
the input of the DRC, and to compute the knee
of the DRC.
Bug
8413913
Change-Id: I386d64793a9fa3f7218e053d6f0a99f6836c02bd
Glenn Kasten [Tue, 17 Sep 2013 22:04:42 +0000 (15:04 -0700)]
am
18f86140: Merge "Fix underruns when fast track denied due to SRC" into klp-dev
* commit '
18f861404efc054da0a2ea6c582e293940f63bc8':
Fix underruns when fast track denied due to SRC
Glenn Kasten [Tue, 17 Sep 2013 22:03:00 +0000 (22:03 +0000)]
Merge "Fix underruns when fast track denied due to SRC" into klp-dev
Glenn Kasten [Tue, 17 Sep 2013 21:50:42 +0000 (14:50 -0700)]
am
fc270954: am
e56f3c96: Merge "strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe."
* commit '
fc270954192ef7e15ac2c88daadd8890d22096e3':
strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe.
Glenn Kasten [Tue, 17 Sep 2013 21:47:57 +0000 (14:47 -0700)]
am
e56f3c96: Merge "strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe."
* commit '
e56f3c96fa6e7550b67e8b049f999aaa2ada1192':
strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe.
Glenn Kasten [Tue, 17 Sep 2013 21:46:05 +0000 (21:46 +0000)]
Merge "strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe."
Glenn Kasten [Tue, 17 Sep 2013 01:07:38 +0000 (18:07 -0700)]
Fix underruns when fast track denied due to SRC
OpenSL ES requests a fast track. If sample rate conversion is needed,
the request is denied by server, and a larger client buffer is used
to handle the higher latency of a normal track. However the client
notification period was calculated based on buffer being divided into
2 sub-buffers. That resulted in the notification period being too long.
The server pulls chunks that are smaller than half the total buffer.
So now the client uses 3 sub-buffers when there is SRC.
Also removed the 'defer wake' optimization because it was incorrect.
This optimization attempted to reduce the number of wakeups of client,
when server releaseBuffer knows that another releaseBuffer will be
following. But there is no way for the first releaseBuffer to predict
how soon the second releaseBuffer will occur. In some cases it was
a long time, and the client underran. So now the client is woken up
immediately if the total number of available frames to client is >=
the minimum number the client wants to see (the notification period).
Also fix bug where minimum frame count was not being used in the
calculation of notification period.
Bug:
10342804
Change-Id: I3c246f4e7bc3684a344f2cf08268dc082e338e2a
seunghak.han [Sat, 7 Sep 2013 05:59:43 +0000 (14:59 +0900)]
strtok stores its values in thread local storage.
So it can not guarantee works well when multithread environment.
AudioFlinger has multithread.
so strtok_r is more safe.
Change-Id: I6d77ef9cc49a4478dd856dcdca14e4920ce955c6
Marco Nelissen [Mon, 16 Sep 2013 23:01:23 +0000 (16:01 -0700)]
am
bc910e5c: Merge "Fix hang" into klp-dev
* commit '
bc910e5c8d05f24531bd6b11379cf41cc73415ed':
Fix hang
Marco Nelissen [Mon, 16 Sep 2013 22:57:17 +0000 (22:57 +0000)]
Merge "Fix hang" into klp-dev
Eino-Ville Talvala [Mon, 16 Sep 2013 22:47:56 +0000 (15:47 -0700)]
am
a099d1f6: Merge "Camera3: Always set a trigger ID for an active trigger" into klp-dev
* commit '
a099d1f6be3fbbb1af4c12b2ab627397f0826982':
Camera3: Always set a trigger ID for an active trigger
Eino-Ville Talvala [Mon, 16 Sep 2013 22:45:56 +0000 (22:45 +0000)]
Merge "Camera3: Always set a trigger ID for an active trigger" into klp-dev
Marco Nelissen [Mon, 16 Sep 2013 20:30:01 +0000 (13:30 -0700)]
Fix hang
Specify that the surface is controlled by the app, to avoid a hang.
b/
10531761
Change-Id: Idccc2c73aa3d368d8e7fbdc071ce36e2382efea4
Zhijun He [Mon, 16 Sep 2013 18:28:02 +0000 (11:28 -0700)]
am
72a2f171: Merge "Camera: setCallBackWindow only if callback surface is used" into klp-dev
* commit '
72a2f171ddf5c1eab7d6ccd47ac2b7ac4fc9c087':
Camera: setCallBackWindow only if callback surface is used
Zhijun He [Mon, 16 Sep 2013 18:23:35 +0000 (18:23 +0000)]
Merge "Camera: setCallBackWindow only if callback surface is used" into klp-dev
Chong Zhang [Mon, 16 Sep 2013 18:17:37 +0000 (11:17 -0700)]
am
a5652e9c: Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags" into klp-dev
* commit '
a5652e9cdaf6624e03a7e84c40590a42e44c5217':
Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags
Chong Zhang [Mon, 16 Sep 2013 18:14:01 +0000 (18:14 +0000)]
Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags" into klp-dev
Zhijun He [Mon, 16 Sep 2013 17:51:50 +0000 (10:51 -0700)]
am
66281c3a: Camera: Don\'t overwrite the error status
* commit '
66281c3a5d7eea486ddc6ad30088ba92956fd4fd':
Camera: Don't overwrite the error status
Eino-Ville Talvala [Fri, 13 Sep 2013 18:39:24 +0000 (11:39 -0700)]
Camera3: Always set a trigger ID for an active trigger
This is to work around HAL implementations that expect to see an
ID for every trigger.
Use a dummy trigger ID of 1, since 0 has special meaning for older
HALs.
Bug:
10720617
Change-Id: I9cb1b8dbcb113cb9e737e5adb04032fd61a54c12
Zhijun He [Mon, 16 Sep 2013 04:06:10 +0000 (21:06 -0700)]
Camera: setCallBackWindow only if callback surface is used
Calling setCallBackWindow without checking the previewCallbackSurface could make
the stream to be deleted during callback stream operation, which is bad because
the preview is still active and the delete fails.
Bug:
10730496
Change-Id: I8addac25e5aa7901bf200d730c749bee2c088090
Zhijun He [Sat, 14 Sep 2013 00:59:59 +0000 (17:59 -0700)]
Camera: Don't overwrite the error status
Bug:
10749544
Change-Id: I6096effde03e18ee1b8c63cf3b36dce0344054c5
Glenn Kasten [Sat, 14 Sep 2013 00:16:15 +0000 (17:16 -0700)]
am
d176ec1e: Merge "Fix SoundPool.play() looping" into klp-dev
* commit '
d176ec1e371a686c58385692a28da677e398c302':
Fix SoundPool.play() looping
Eric Laurent [Sat, 14 Sep 2013 00:16:14 +0000 (17:16 -0700)]
am
7f91e5e0: Merge "audioflinger: fix ro.audio.silent in offload mode" into klp-dev
* commit '
7f91e5e09cf3bd8068894b2e54cbdaac70bf53a0':
audioflinger: fix ro.audio.silent in offload mode
Zhijun He [Sat, 14 Sep 2013 00:15:18 +0000 (17:15 -0700)]
am
d4dadf23: Merge "Camera: Limit supported preview sizes" into klp-dev
* commit '
d4dadf23dd2dd8acd514d60d84475954070340b8':
Camera: Limit supported preview sizes
Eric Laurent [Sat, 14 Sep 2013 00:15:06 +0000 (17:15 -0700)]
am
972a173d: audioflinger: longer offload thread standby delay
* commit '
972a173d7d1de1a3b5a617aae3e2abb6e05ae02d':
audioflinger: longer offload thread standby delay
Glenn Kasten [Sat, 14 Sep 2013 00:08:55 +0000 (00:08 +0000)]
Merge "Fix SoundPool.play() looping" into klp-dev
Eric Laurent [Sat, 14 Sep 2013 00:07:28 +0000 (00:07 +0000)]
Merge "audioflinger: fix ro.audio.silent in offload mode" into klp-dev
Eric Laurent [Sat, 14 Sep 2013 00:00:08 +0000 (17:00 -0700)]
audioflinger: fix ro.audio.silent in offload mode
Change-Id: I5a1a79000d53146689b0a198cc5419c36509703f