OSDN Git Service
jpadmana [Wed, 2 Oct 2013 01:46:55 +0000 (18:46 -0700)]
am
f8c3e61b: am
faca05e9: Effect Offload Proxy for effects offload
* commit '
f8c3e61b35fe86c2cfbc703023e450efe597ef86':
jpadmana [Wed, 2 Oct 2013 01:46:54 +0000 (18:46 -0700)]
am
cbc615b7: am
2eab94f7: Effects Factory changes for effects offload
* commit '
cbc615b735a0de416ec2d13e740224faf7e8267d':
Eric Laurent [Wed, 2 Oct 2013 01:46:54 +0000 (18:46 -0700)]
am
5debd97c: am
83f40005: Revert "Effects Factory changes for effects offload"
* commit '
5debd97c07eceffe62821b21f99304e187d0df05':
Eric Laurent [Wed, 2 Oct 2013 01:46:53 +0000 (18:46 -0700)]
am
211fe4a3: am
5b8ce24b: Revert "Effect Offload Proxy for effects offload"
* commit '
211fe4a3ec5ec8c83f028aeb6a5ebe1e44cd1615':
Eric Laurent [Wed, 2 Oct 2013 01:46:53 +0000 (18:46 -0700)]
am
1db33c2f: am
f2c8b027: Merge "fix playback position after switching to offload" into klp-dev
* commit '
1db33c2fdffa620fb921faf6e16629ca86b398c9':
Jean-Michel Trivi [Wed, 2 Oct 2013 01:46:52 +0000 (18:46 -0700)]
am
8b37f308: am
0b74d2b4: Merge "LoudnessEnhancer compatible with stereo imaging" into klp-dev
* commit '
8b37f3081cb234e3cb4ab242af12cf338c4f5e52':
Jean-Michel Trivi [Wed, 2 Oct 2013 01:46:52 +0000 (18:46 -0700)]
am
c9f13712: am
a2340b30: Merge "Don\'t call audio effect process on offloaded playback threads" into klp-dev
* commit '
c9f13712d943fc99bfb0b954d035174c42726ef9':
Eric Laurent [Wed, 2 Oct 2013 01:46:51 +0000 (18:46 -0700)]
am
18927fac: am
0adc67df: Merge "audioflinger: fix crash when starting offload thread" into klp-dev
* commit '
18927fac191100ae2a2b6cc7abe28cc3b1317e40':
Eino-Ville Talvala [Wed, 2 Oct 2013 01:46:50 +0000 (18:46 -0700)]
am
3da3d8e6: am
1da3b602: Camera2 API: Hack: Always use async mode with GLConsumer
* commit '
3da3d8e641cf38f81ba1e9b99de2e77e4ca9b138':
Marco Nelissen [Wed, 2 Oct 2013 01:44:26 +0000 (18:44 -0700)]
am
3d97e23f: Merge "Prevent onPrepared callback from being called twice" into klp-dev
* commit '
3d97e23fcd78f752443cb6c30a1ee39f49f1f987':
Prevent onPrepared callback from being called twice
jpadmana [Tue, 1 Oct 2013 00:09:32 +0000 (17:09 -0700)]
am
faca05e9: Effect Offload Proxy for effects offload
* commit '
faca05e96744dfaa2f352e3dbb29eead4e55cfa0':
Effect Offload Proxy for effects offload
jpadmana [Tue, 1 Oct 2013 00:09:32 +0000 (17:09 -0700)]
am
2eab94f7: Effects Factory changes for effects offload
* commit '
2eab94f7dfd41a65e13aca379a1aed97447f8884':
Effects Factory changes for effects offload
Eric Laurent [Tue, 1 Oct 2013 00:09:31 +0000 (17:09 -0700)]
am
83f40005: Revert "Effects Factory changes for effects offload"
* commit '
83f400056ac913250f0926326ff78697c68d18a1':
Revert "Effects Factory changes for effects offload"
Eric Laurent [Tue, 1 Oct 2013 00:09:31 +0000 (17:09 -0700)]
am
5b8ce24b: Revert "Effect Offload Proxy for effects offload"
* commit '
5b8ce24b849f6cd5629b4ba508f7c78d6227d250':
Revert "Effect Offload Proxy for effects offload"
Eric Laurent [Tue, 1 Oct 2013 00:08:11 +0000 (17:08 -0700)]
am
f2c8b027: Merge "fix playback position after switching to offload" into klp-dev
* commit '
f2c8b02786c58b98d41d3f7c30e882cacc34e7ab':
fix playback position after switching to offload
Jean-Michel Trivi [Tue, 1 Oct 2013 00:07:08 +0000 (17:07 -0700)]
am
0b74d2b4: Merge "LoudnessEnhancer compatible with stereo imaging" into klp-dev
* commit '
0b74d2b49b418d55f642c87c126fc0a4f71f89a4':
LoudnessEnhancer compatible with stereo imaging
Jean-Michel Trivi [Tue, 1 Oct 2013 00:07:08 +0000 (17:07 -0700)]
am
a2340b30: Merge "Don\'t call audio effect process on offloaded playback threads" into klp-dev
* commit '
a2340b3059b9d6e4286d0db7069df477c164df0c':
Don't call audio effect process on offloaded playback threads
Eric Laurent [Tue, 1 Oct 2013 00:06:17 +0000 (17:06 -0700)]
am
0adc67df: Merge "audioflinger: fix crash when starting offload thread" into klp-dev
* commit '
0adc67dfc5cedb211c36f06849681a60a32f5805':
audioflinger: fix crash when starting offload thread
Eino-Ville Talvala [Tue, 1 Oct 2013 00:06:17 +0000 (17:06 -0700)]
am
1da3b602: Camera2 API: Hack: Always use async mode with GLConsumer
* commit '
1da3b602130d71ac3bff1a1fdecdc5e0d7b9d701':
Camera2 API: Hack: Always use async mode with GLConsumer
Eric Laurent [Mon, 30 Sep 2013 21:17:24 +0000 (14:17 -0700)]
am
5d6d86a4: fix oflload effect proxy commmand handling
* commit '
5d6d86a4d102704f49b9235eaf282c428d7100b6':
fix oflload effect proxy commmand handling
Eric Laurent [Mon, 30 Sep 2013 21:17:23 +0000 (14:17 -0700)]
am
eba9bf72: fix command handling in effect offload proxy
* commit '
eba9bf72fb5e036bb15ca4a1dc126883a2cb938d':
fix command handling in effect offload proxy
jpadmana [Mon, 30 Sep 2013 21:17:22 +0000 (14:17 -0700)]
am
faca05e9: Effect Offload Proxy for effects offload
* commit '
faca05e96744dfaa2f352e3dbb29eead4e55cfa0':
Effect Offload Proxy for effects offload
jpadmana [Mon, 30 Sep 2013 21:17:21 +0000 (14:17 -0700)]
am
2eab94f7: Effects Factory changes for effects offload
* commit '
2eab94f7dfd41a65e13aca379a1aed97447f8884':
Effects Factory changes for effects offload
Eric Laurent [Mon, 30 Sep 2013 21:17:20 +0000 (14:17 -0700)]
am
83f40005: Revert "Effects Factory changes for effects offload"
* commit '
83f400056ac913250f0926326ff78697c68d18a1':
Revert "Effects Factory changes for effects offload"
Eric Laurent [Mon, 30 Sep 2013 21:17:20 +0000 (14:17 -0700)]
am
5b8ce24b: Revert "Effect Offload Proxy for effects offload"
* commit '
5b8ce24b849f6cd5629b4ba508f7c78d6227d250':
Revert "Effect Offload Proxy for effects offload"
Eric Laurent [Mon, 30 Sep 2013 21:14:34 +0000 (14:14 -0700)]
am
f2c8b027: Merge "fix playback position after switching to offload" into klp-dev
* commit '
f2c8b02786c58b98d41d3f7c30e882cacc34e7ab':
fix playback position after switching to offload
Jean-Michel Trivi [Mon, 30 Sep 2013 21:13:40 +0000 (14:13 -0700)]
am
0b74d2b4: Merge "LoudnessEnhancer compatible with stereo imaging" into klp-dev
* commit '
0b74d2b49b418d55f642c87c126fc0a4f71f89a4':
LoudnessEnhancer compatible with stereo imaging
Jean-Michel Trivi [Mon, 30 Sep 2013 21:13:39 +0000 (14:13 -0700)]
am
a2340b30: Merge "Don\'t call audio effect process on offloaded playback threads" into klp-dev
* commit '
a2340b3059b9d6e4286d0db7069df477c164df0c':
Don't call audio effect process on offloaded playback threads
Eric Laurent [Mon, 30 Sep 2013 21:12:28 +0000 (14:12 -0700)]
am
0adc67df: Merge "audioflinger: fix crash when starting offload thread" into klp-dev
* commit '
0adc67dfc5cedb211c36f06849681a60a32f5805':
audioflinger: fix crash when starting offload thread
Eino-Ville Talvala [Mon, 30 Sep 2013 21:12:28 +0000 (14:12 -0700)]
am
1da3b602: Camera2 API: Hack: Always use async mode with GLConsumer
* commit '
1da3b602130d71ac3bff1a1fdecdc5e0d7b9d701':
Camera2 API: Hack: Always use async mode with GLConsumer
Marco Nelissen [Sat, 28 Sep 2013 02:25:14 +0000 (02:25 +0000)]
Merge "Prevent onPrepared callback from being called twice" into klp-dev
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: I28aa0f0d806e846332bc29801ee40d34e4ea0c43
Eric Laurent [Fri, 27 Sep 2013 22:04:26 +0000 (15:04 -0700)]
fix command handling in effect offload proxy
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: I119458fea597cc3acbc0ef9ec315f67aa211cbd9
jpadmana [Tue, 4 Jun 2013 10:33:29 +0000 (16:03 +0530)]
Effect Offload Proxy for effects offload
Effect Proxy abstracts the sub effects to the upper layers.
It has the following functionalities:
- creation and release of sub effects
- routing the effect commands and process to the appropriate sub effect
Bug:
8174034.
Change-Id: Iec34b61104f0bbec4ef67c62f0710a5536dc325b
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
jpadmana [Tue, 4 Jun 2013 10:38:29 +0000 (16:08 +0530)]
Effects Factory changes for effects offload
audio_effects.conf - commented changes to illustrate the
addition of Proxy and sub effects to the conf file
Added an effectFactoryApi - EffectGetSubEffects for querying the
sub effect descriptors from the factory. This api is used by the Proxy
to get the sub effects
Added functions and data structures in factory code for
loading the sub effects
gSubEffectList - has the Proxies and their corresponding sub effects
- addSubEffect() - reads a sub effect node and adds to the gSubEffectList
- findSubEffect() - searches through the gSubEffectList to find a SubEffect
Bug:
8174034.
Change-Id: Id7f6aa67c41db370d32beaf43a979ba4ac925928
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Eric Laurent [Fri, 27 Sep 2013 21:53:24 +0000 (14:53 -0700)]
Revert "Effects Factory changes for effects offload"
This reverts commit
284c17e73bbff51cb5b1adcee98386d47733757a.
Change-Id: I31db21e1ad4758b21356bfe4c4c64f15b2da8737
Eric Laurent [Fri, 27 Sep 2013 21:50:48 +0000 (14:50 -0700)]
Revert "Effect Offload Proxy for effects offload"
This reverts commit
60c60df7db278d2fa5c90b0fa14f99a61d50272b.
Change-Id: Iafba9e02a9f3bfde6248d802e96c4e649686a87d
Marco Nelissen [Fri, 27 Sep 2013 19:13:52 +0000 (12:13 -0700)]
Prevent onPrepared callback from being called twice
b/
10891995
Change-Id: If6845c832d114629282f0b03f904a37c3325208e
Eric Laurent [Fri, 27 Sep 2013 16:29:36 +0000 (16:29 +0000)]
Merge "fix playback position after switching to offload" into klp-dev
Eric Laurent [Fri, 27 Sep 2013 00:23:10 +0000 (17:23 -0700)]
fix playback position after switching to offload
After switching from offloaded track to PCM track
while paused (e.g. when connecting A2DP), playback
restarts from the beginning of the song when resuming.
Save current position before recreating an AudioPlayer
in AwesomePlayer::play_l() and seek to the saved position before
starting playback.
Also fix a problem where the position is not reported properly
by AudioPlayer if a seek is pending and queried just after start
and before the first buffer is read from the MediaSource.
Bug:
8174034.
Change-Id: I254e65418ff903a9bf2e2111b89a00e2e54876c5
Jean-Michel Trivi [Fri, 27 Sep 2013 01:21:38 +0000 (01:21 +0000)]
Merge "LoudnessEnhancer compatible with stereo imaging" into klp-dev
Jean-Michel Trivi [Fri, 27 Sep 2013 00:50:59 +0000 (00:50 +0000)]
Merge "Don't call audio effect process on offloaded playback threads" into klp-dev
Eric Laurent [Thu, 26 Sep 2013 22:58:26 +0000 (22:58 +0000)]
Merge "audioflinger: fix crash when starting offload thread" into klp-dev
Eric Laurent [Thu, 26 Sep 2013 22:28:21 +0000 (15:28 -0700)]
audioflinger: fix crash when starting offload thread
Passing a sp to parent thread to AsyncCallbackThread() constructor
causes a strong reference to be acquired on the OffloadThread inside
its constructor which causes an early launch of the thread loop
with unpredictable consequences.
Pass a wp to parent thread instead.
Also move the creation of the AsyncCallbackThread to
readOutputParameters() where mUseAsyncWrite is initialized which
makes more sense.
Also change the type of AsyncCallbackThread parent thread to PlaybackThread
instead of OffloadThread to allow a broder use of non blocking write which
in theory is not limited to audio offload use case.
Bug:
8174034.
Change-Id: I4b093b022030cd4f5eb8b8e477333e91098a6549
Eino-Ville Talvala [Thu, 26 Sep 2013 22:28:55 +0000 (15:28 -0700)]
Camera2 API: Hack: Always use async mode with GLConsumer
Until a cleaner solution is implemented, force buffer queues to
consumers that set USAGE_HW_TEXTURE usage to be asynchronous.
Bug:
10949105
Change-Id: I69e6b02b773831396767c282ce8c5936c5d41f03
Jean-Michel Trivi [Thu, 26 Sep 2013 01:43:55 +0000 (18:43 -0700)]
LoudnessEnhancer compatible with stereo imaging
Use a single compressor for both channels.
Envelope of signal is determined by looking at both channels.
Bug
8413913
Change-Id: Ia9b6f34923d2977c60a3352500b858dfa1fab33c
Jean-Michel Trivi [Thu, 26 Sep 2013 01:50:33 +0000 (18:50 -0700)]
Don't call audio effect process on offloaded playback threads
An audio effect process command is not meant to be called for
playback threads belonging to offloaded playback.
Bug
10933817
Change-Id: Idc7b6a0224791bbf8d61648474d3c288617c498f
Zhijun He [Thu, 26 Sep 2013 00:01:19 +0000 (17:01 -0700)]
am
369af71e: am
6914de6d: Merge "Camera: Implement getCameraCharacteristics" into klp-dev
* commit '
369af71eb7e402ee68b66b0f0ede5d4d40c857d1':
Camera: Implement getCameraCharacteristics
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:10:30 +0000 (13:10 -0700)]
am
4e141a4f: am
1802399c: Merge "fix deadlock in audioflinger::createEffect()" into klp-dev
* commit '
4e141a4f1303767f70ea983925ec01b034fe667b':
fix deadlock in audioflinger::createEffect()
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:34:41 +0000 (12:34 -0700)]
am
8318c786: am
2b890936: Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into klp-dev
* commit '
8318c7862f2edca41a0e1d10d2e45af026e6089f':
Camera2/3: Support new PASSIVE_UNFOCUSED AF state
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:35:00 +0000 (10:35 -0700)]
am
9843e8c9: am
58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before first access unit" into klp-dev
* commit '
9843e8c9446aec0c25168ff4561bdbb12948f1c7':
Send kWhatConnected in onTimeUpdate() before first access unit
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:19:41 +0000 (10:19 -0700)]
am
a35b4278: am
6c63fe0f: am
ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"
* commit '
a35b4278582175ee7e4082c0e93ddb4a83726f47':
MediaCodec: Pass the crop rect to SoftwareRenderer
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:46:18 +0000 (16:46 -0700)]
am
42d4e659: am
d2ac3144: Merge "Fix log typos in Visualizer effect" into klp-dev
* commit '
42d4e659dec636fad2b76c562296812b80d67fac':
Fix log typos in Visualizer effect
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:47:32 +0000 (15:47 -0700)]
am
920e45e5: am
ddfbfaeb: fix oflload effect proxy commmand handling
* commit '
920e45e50ad78a942a32d924f900537d4e1cfb99':
fix oflload effect proxy commmand handling
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:11:46 +0000 (14:11 -0700)]
am
8ee02943: am
1c7f35d1: Merge "soundpool: allocate shared memory heap by client" into klp-dev
* commit '
8ee02943b61e0a7dd78e5596720261b185a223d5':
soundpool: allocate shared memory heap by client
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:33:54 +0000 (13:33 -0700)]
am
50ad1d36: am
1ecd3dc4: Merge "Camera2/3: Properly disambiguate FPS range vs. single FPS setting" into klp-dev
* commit '
50ad1d3631efb486b3043c63ebd2774c7e3d337b':
Camera2/3: Properly disambiguate FPS range vs. single FPS setting
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:57:16 +0000 (10:57 -0700)]
am
a57e2ab5: am
664539d2: audioflinger: fix ro.audio.silent in offload again
* commit '
a57e2ab58a17d3da35593a6c85f65e19249e9ebc':
audioflinger: fix ro.audio.silent in offload again
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
Jean-Michel Trivi [Tue, 24 Sep 2013 17:25:35 +0000 (10:25 -0700)]
am
c7b2f9dc: am
402dfba6: Merge "Add support for level measurements in Visualizer" into klp-dev
* commit '
c7b2f9dce911026fa13854b49aa2bb5353f68499':
Add support for level measurements in Visualizer
Eric Laurent [Tue, 24 Sep 2013 17:25:35 +0000 (10:25 -0700)]
am
3f079bb9: am
1d2536f4: Merge "AudioTrack: fix music resume" into klp-dev
* commit '
3f079bb9ca87c3c1834cc5be0dafc6514938b578':
AudioTrack: fix music resume
Eric Laurent [Tue, 24 Sep 2013 17:25:34 +0000 (10:25 -0700)]
am
3f1d3b97: am
21e54568: fix incoming call audio start time.
* commit '
3f1d3b97f723cf39fe6bde9efd0a3fc9e78028a5':
fix incoming call audio start time.
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
Marco Nelissen [Mon, 23 Sep 2013 22:43:09 +0000 (22:43 +0000)]
Merge "Fix aac decoder flush"
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:11:47 +0000 (15:11 -0700)]
am
e97d1ba9: am
4b701cc0: Merge "Revert "Workaround slow AudioTrack destruction"" into klp-dev
* commit '
e97d1ba9471a71c6b18cee23c98535d553303dac':
Revert "Workaround slow AudioTrack destruction"
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"