OSDN Git Service
Phil Burk [Thu, 6 Jul 2017 04:18:55 +0000 (04:18 +0000)]
Merge "aaudio: MMAP input not implement pause flush" into oc-dr1-dev am:
014a56b57a
am:
983bd9792c
Change-Id: I7e37bd0ece7ade53eacfa6806eb8f75a42be1d8c
Phil Burk [Thu, 6 Jul 2017 03:54:05 +0000 (03:54 +0000)]
Merge "aaudio: MMAP input not implement pause flush" into oc-dr1-dev
am:
014a56b57a
Change-Id: If685934379e5f34540dfade0a5c31f36281dd8cc
TreeHugger Robot [Thu, 6 Jul 2017 03:44:32 +0000 (03:44 +0000)]
Merge "aaudio: MMAP input not implement pause flush" into oc-dr1-dev
Hangyu Kuang [Thu, 6 Jul 2017 03:40:24 +0000 (03:40 +0000)]
Merge "(DO NOT MERGE) media: Don't wait at MediaRecorder::stop() if we haven't received any frames." into oc-dr1-dev am:
0f96fc772a
am:
7342d0939a
Change-Id: I452de368e7387cfd5ca2ee1b833e877023bfc035
Hangyu Kuang [Thu, 6 Jul 2017 03:29:53 +0000 (03:29 +0000)]
Merge "(DO NOT MERGE) media: Don't wait at MediaRecorder::stop() if we haven't received any frames." into oc-dr1-dev
am:
0f96fc772a
Change-Id: Ia0eee918b5094278d929f06005fb373219ebd37a
TreeHugger Robot [Thu, 6 Jul 2017 03:21:08 +0000 (03:21 +0000)]
Merge "(DO NOT MERGE) media: Don't wait at MediaRecorder::stop() if we haven't received any frames." into oc-dr1-dev
Phil Burk [Wed, 5 Jul 2017 22:35:43 +0000 (15:35 -0700)]
aaudio: MMAP input not implement pause flush
They should return AAUDIO_ERROR_UNIMPLEMENTED
just like the legacy streams.
Bug:
63351465
Test: CTS test_aaudio.cpp testPauseAndFlushNotSupported
Change-Id: I42c8d45517bf0d808e648287579b9fb0c0cb3ae0
Phil Burk [Wed, 5 Jul 2017 23:52:44 +0000 (23:52 +0000)]
Merge "aaudio: only use MMAP for low latency perf mode" into oc-dr1-dev am:
27e9c66294
am:
7cb5619220
Change-Id: Idfdd35ec698e0f24865b4e8d0fa8083394f495fe
Hangyu Kuang [Tue, 20 Jun 2017 18:25:06 +0000 (11:25 -0700)]
(DO NOT MERGE) media: Don't wait at MediaRecorder::stop() if we haven't received any frames.
Also add a maximum stopTimeOffset in MediaCodecSource to guard against long delay
in MediaSource which leads to MediaRecorder::stop() getting stuck.
Bug:
62231788
Test: MediaRecorder CTS test.
Change-Id: Ic58f295c9be1b1f500324261be6a34f322ef518e
(cherry picked from commit
cf3205fab08adfdc9d5c0fef1cef54cab0074117)
Phil Burk [Wed, 5 Jul 2017 23:13:38 +0000 (23:13 +0000)]
Merge "aaudio: only use MMAP for low latency perf mode" into oc-dr1-dev
am:
27e9c66294
Change-Id: Iebd09fe7d785527cc2e3bd11307297da36c8433a
TreeHugger Robot [Wed, 5 Jul 2017 23:04:33 +0000 (23:04 +0000)]
Merge "aaudio: only use MMAP for low latency perf mode" into oc-dr1-dev
Phil Burk [Wed, 5 Jul 2017 22:26:07 +0000 (22:26 +0000)]
aaudio: return channelCount in legacy stream am:
a5247769a8
am:
bfa6c20fb4
Change-Id: I863862980f48f5f208b41448833b8144e9c7aa49
Phil Burk [Wed, 5 Jul 2017 22:16:04 +0000 (22:16 +0000)]
aaudio: return channelCount in legacy stream
am:
a5247769a8
Change-Id: Ia6679fb05f311c564b7c4c87ed82311374a0fc17
Phil Burk [Wed, 5 Jul 2017 20:54:32 +0000 (13:54 -0700)]
aaudio: only use MMAP for low latency perf mode
This is a quick workaround that just disables MMAP mode unless
performance mode is LOW_LATENCY.
Bug:
63176221
Test: use write_sine and change performance mode
Change-Id: Ic17ad45366d51d86fb4801c84ada4f6f82b5ff98
Phil Burk [Wed, 5 Jul 2017 19:57:58 +0000 (12:57 -0700)]
aaudio: return channelCount in legacy stream
Bug:
63336407
Test: Use input_monitor.cpp and set requested channel count to zero
Change-Id: Ibe7688bb94e0142ee0779c74ddec62c9552efb79
TreeHugger Robot [Wed, 5 Jul 2017 19:53:16 +0000 (19:53 +0000)]
Merge changes Idc8aecad,I7d28827f,Iafe731d0
* changes:
Fix nbaio headers by moving them to include/media/nbaio
Fix audioprocessing headers by moving them to include/media
Fix audiohal headers to be under include/media/audiohal
Jiyong Park [Tue, 4 Jul 2017 01:56:23 +0000 (10:56 +0900)]
Build libclearkeycasplugin with BOARD_VNDK_VERSION
Instead of relying on the global include paths, use the new headers lib
'media_plugin_headers'.
Bug:
37342627
Test: BOARD_VNDK_VERSION=current m -j libclearkeycasplugin
Change-Id: Ic6b5230bc9b674e21ccd36ce6ad117c687200599
Eric Laurent [Sun, 2 Jul 2017 02:32:49 +0000 (02:32 +0000)]
aaudio: enable exclusive MMAP mode support am:
d51329eca8
am:
b66815f31c
Change-Id: I02e0c91d5ce2dc0ceb7b47aa27c6c63a69e90a3a
Eric Laurent [Sun, 2 Jul 2017 02:30:17 +0000 (02:30 +0000)]
aaudio: enable exclusive MMAP mode support
am:
d51329eca8
Change-Id: I7b618a0073c1bada8c263ab9c56baf54698f5e10
Eric Laurent [Fri, 30 Jun 2017 23:06:16 +0000 (16:06 -0700)]
aaudio: enable exclusive MMAP mode support
Allow exclusive MMAP mode only if the HAL indicates
that the FD returned for shared memory buffer can be shared
with any application.
NOTE: the way the HAL indicates this is temporary until the audio
HAL is modified in next HIDL release.
Bug:
37167970
Test: check playback and capture in mmap exclusive and shared mode
Change-Id: I09c1461b2f99532ded2ef9d36d483b82096fda68
Phil Burk [Sat, 1 Jul 2017 23:56:41 +0000 (23:56 +0000)]
aaudio: improved dumpsys am:
4501b3510f
am:
c2080abab0
Change-Id: Ia64a1040bca886c8bcd25ce4e7ac7c1703680798
Phil Burk [Sat, 1 Jul 2017 23:54:09 +0000 (23:54 +0000)]
aaudio: improved dumpsys
am:
4501b3510f
Change-Id: Ieef211c004dc07f0cd9ec49860ae52057ec01f42
Phil Burk [Fri, 30 Jun 2017 01:12:36 +0000 (18:12 -0700)]
aaudio: improved dumpsys
Add more information about various streams and endpoints.
Bug:
38396780
Test: adb shell dumpsys media.aaudio
Change-Id: I5cc116574bfc3aa93703c182d933dbdfcbefad7a
Phil Burk [Sat, 1 Jul 2017 19:59:29 +0000 (19:59 +0000)]
Merge "aaudio: limit number of streams per process" into oc-dr1-dev am:
8dd045aaf7
am:
4e862f6505
Change-Id: I9c86fd02bb6167a70c35dcbccebb7907679b5b86
Phil Burk [Sat, 1 Jul 2017 19:57:30 +0000 (19:57 +0000)]
Merge "aaudio: limit number of streams per process" into oc-dr1-dev
am:
8dd045aaf7
Change-Id: Id45d02293f50707413c4a43247ce6402759fb941
TreeHugger Robot [Sat, 1 Jul 2017 19:52:04 +0000 (19:52 +0000)]
Merge "aaudio: limit number of streams per process" into oc-dr1-dev
Phil Burk [Fri, 30 Jun 2017 19:23:05 +0000 (12:23 -0700)]
aaudio: limit number of streams per process
Testing the new max streams restriction revealed the bug
involving the second shared stream.
Bug:
62951298
Bug:
63171495
Test: test_n_streams.cpp can open MAX_STREAMS_PER_PROCESS MMAP streams
Change-Id: Ibea7d9c4716326a37c669954b52f397ed2968caa
Phil Burk [Sat, 1 Jul 2017 05:40:28 +0000 (05:40 +0000)]
Merge "aaudio: disconnect when onTearDown() called" into oc-dr1-dev am:
80f5e44d60
am:
994194aecc
Change-Id: Iaf04548b586c040ec4d3542468d850053b13d7c7
Phil Burk [Sat, 1 Jul 2017 05:35:30 +0000 (05:35 +0000)]
Merge "aaudio: disconnect when onTearDown() called" into oc-dr1-dev
am:
80f5e44d60
Change-Id: Ieb2008d6725c1f507ed8fcf483897c8e69ec3a72
TreeHugger Robot [Sat, 1 Jul 2017 05:31:56 +0000 (05:31 +0000)]
Merge "aaudio: disconnect when onTearDown() called" into oc-dr1-dev
Hangyu Kuang [Sat, 1 Jul 2017 03:41:52 +0000 (03:41 +0000)]
Merge "Revert "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align""" into oc-dr1-dev am:
6ec18f8ce3
am:
be2a4194a3
Change-Id: I5d977739b936fb6796ae90b1208655536a32fa1b
Hangyu Kuang [Sat, 1 Jul 2017 03:36:52 +0000 (03:36 +0000)]
Merge "Revert "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align""" into oc-dr1-dev
am:
6ec18f8ce3
Change-Id: I96911274a6f52809a2750a127b355cf99bf947ed
TreeHugger Robot [Sat, 1 Jul 2017 03:29:48 +0000 (03:29 +0000)]
Merge "Revert "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align""" into oc-dr1-dev
Phil Burk [Fri, 30 Jun 2017 18:43:37 +0000 (11:43 -0700)]
aaudio: disconnect when onTearDown() called
It will be called, for example, when switching from speaker to Bluetooth.
Bug:
62883778
Test: run a long app and switch to or from Bluetooth
Change-Id: Iafb9b52d85c30fee71de46abfb99a27a1daabf59
Phil Burk [Sat, 1 Jul 2017 03:16:50 +0000 (03:16 +0000)]
Merge "aaudio: fix resource leak in client tracking" into oc-dr1-dev am:
fef6b3d4fd
am:
69d3d0dfb6
Change-Id: I705c6b823ae141306a48b29a7e218b865016b865
Phil Burk [Sat, 1 Jul 2017 03:11:51 +0000 (03:11 +0000)]
Merge "aaudio: fix resource leak in client tracking" into oc-dr1-dev
am:
fef6b3d4fd
Change-Id: I9aa64dc3e76f0858ca898a1be036e38ba5ab810f
TreeHugger Robot [Sat, 1 Jul 2017 03:03:58 +0000 (03:03 +0000)]
Merge "aaudio: fix resource leak in client tracking" into oc-dr1-dev
Phil Burk [Sat, 1 Jul 2017 02:14:14 +0000 (02:14 +0000)]
Merge "aaudio: fix mixer volume" into oc-dr1-dev am:
097da17bd5
am:
1911951ad3
Change-Id: Ia360ba971e9f353aa9220b0cb5ccd0c9293c31d1
Phil Burk [Sat, 1 Jul 2017 02:08:47 +0000 (02:08 +0000)]
Merge "aaudio: fix mixer volume" into oc-dr1-dev
am:
097da17bd5
Change-Id: I32d35f0b0d5ec43950362def009f3e71f18c5cdc
Eric Laurent [Sat, 1 Jul 2017 02:08:47 +0000 (02:08 +0000)]
Merge "aaudio: modify endpoint sharing logic" into oc-dr1-dev am:
358ad4257d
am:
cbaf5e98ee
Change-Id: I7334c473d2618e96a8441c6f5a59354c11c4d615
TreeHugger Robot [Sat, 1 Jul 2017 02:03:50 +0000 (02:03 +0000)]
Merge "aaudio: fix mixer volume" into oc-dr1-dev
Eric Laurent [Sat, 1 Jul 2017 02:03:47 +0000 (02:03 +0000)]
Merge "aaudio: modify endpoint sharing logic" into oc-dr1-dev
am:
358ad4257d
Change-Id: I08614f5f530106f2d03074bf1a0b3b03cbaafcc0
TreeHugger Robot [Sat, 1 Jul 2017 01:59:37 +0000 (01:59 +0000)]
Merge "aaudio: modify endpoint sharing logic" into oc-dr1-dev
Jean-Michel Trivi [Sat, 1 Jul 2017 01:21:12 +0000 (01:21 +0000)]
Merge "Audio routing: Fix notification routing during A11y playback" into oc-dr1-dev am:
53f4c18b5a
am:
f64d1add0b
Change-Id: I125d4754063892f23ce470a0f72114e0fa7d8782
Jean-Michel Trivi [Sat, 1 Jul 2017 01:17:13 +0000 (01:17 +0000)]
Merge "Audio routing: Fix notification routing during A11y playback" into oc-dr1-dev
am:
53f4c18b5a
Change-Id: I2bead291c19e5d2a475c6a8cc131b29467605d3f
TreeHugger Robot [Sat, 1 Jul 2017 01:07:39 +0000 (01:07 +0000)]
Merge "Audio routing: Fix notification routing during A11y playback" into oc-dr1-dev
Phil Burk [Fri, 30 Jun 2017 23:48:15 +0000 (16:48 -0700)]
aaudio: fix mixer volume
Bug:
63176151
Test: play write_sine.cpp in both legacy and MMAP modes
Change-Id: If5fb61fe959dbc361ff8f95ca3d743e877800163
Mikhail Naganov [Fri, 30 Jun 2017 22:33:51 +0000 (15:33 -0700)]
audiohal: Avoid making unneeded calls to HIDL inteface's ::castFrom
Instead of calling '::castFrom' every time a conversion from
IDevice to IPrimaryDevice is needed, make this conversion at
initialization.
This is to avoid additional IPC calls that are required
for 'castFrom'.
Bug:
63142881
Change-Id: Ic4192c729011ce2653772847e83da426116f9e94
Test: audio works
Vijay Venkatraman [Fri, 30 Jun 2017 22:17:05 +0000 (15:17 -0700)]
Fix nbaio headers by moving them to include/media/nbaio
Bug:
63172425
Test: Build target
Change-Id: Idc8aecad00aa4d31125ff1026a2c7c8654dd1a9e
Jean-Michel Trivi [Fri, 30 Jun 2017 21:50:01 +0000 (14:50 -0700)]
Audio routing: Fix notification routing during A11y playback
When notifications are played, the audio policy checks if media
is playing for deciding which devices will play it. In the
absence of media, the notification is duplicated on speaker
and headset. With media playing, the notification routing
is set to that of the media strategy.
The bug is observed during A11y playback on headset with a
notification playing: A11y is playing on headset, but the
device can't play the notification on speaker + headset at
the same time, resulting in the notification playing in and
out based on the A11y playback in headset.
The fix is to also consider A11y activity when routing
notification playback (under STRATEGY_SONIFICATION_RESPECTFUL).
This improves the UX the notification is not missed, and
doesn't cut in and out.
Test: play Talkback on headset, receive notification at the same time.
Bug:
62907561
Change-Id: Ib924ec41cb7e16d6f2686d8615facba08e256ade
Vijay Venkatraman [Fri, 30 Jun 2017 21:43:09 +0000 (14:43 -0700)]
Fix audioprocessing headers by moving them to include/media
Bug:
63172425
Test: Build target
Change-Id: I7d28827f93133af6f94d9f48c2346ff5d4011df5
Vijay Venkatraman [Fri, 30 Jun 2017 21:20:00 +0000 (14:20 -0700)]
Fix audiohal headers to be under include/media/audiohal
Bug:
63172425
Test: Build target
Change-Id: Iafe731d02a5c7ebd1a3a41143150a80a793ceb86
Eric Laurent [Thu, 29 Jun 2017 22:43:55 +0000 (15:43 -0700)]
aaudio: modify endpoint sharing logic
A new Client stream in shared mode can share an existing endpoint
if it has no preferences or compatible device, sample rate and channel
count requests.
Bug:
62961537
Test: play and capture with AAudio in mmap mode
Change-Id: I38536fb486dfc06f4399f7d02248384583fd3a17
Hangyu Kuang [Fri, 30 Jun 2017 18:06:43 +0000 (11:06 -0700)]
Revert "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align""
Test: Video Recording.
This reverts commit
59f57541aee1221dd552a202c8a35d799d34979c.
Change-Id: I38e6252743235900d0cff3408d8f7f4690a2ae77
Phil Burk [Fri, 30 Jun 2017 17:28:20 +0000 (10:28 -0700)]
aaudio: fix resource leak in client tracking
Was using the wrong pid.
Bug:
38267698
Test: run an aaudio example like write_sine.cpp and control-C in the middle
Change-Id: I8819fcdd78354554b926d8b8a59efa1a81fed110
Phil Burk [Fri, 30 Jun 2017 06:59:06 +0000 (06:59 +0000)]
Merge "aaudio: close MMAP stream if client dies" into oc-dr1-dev am:
e27d3a435c
am:
7668940938
Change-Id: I447b8dcd864ed9517e4ca61bc341eee2a24c2707
Phil Burk [Fri, 30 Jun 2017 06:54:37 +0000 (06:54 +0000)]
Merge "aaudio: close MMAP stream if client dies" into oc-dr1-dev
am:
e27d3a435c
Change-Id: Icd7459e3fc5f3d18b0b6a30e43514cc07bdee32e
TreeHugger Robot [Fri, 30 Jun 2017 06:49:24 +0000 (06:49 +0000)]
Merge "aaudio: close MMAP stream if client dies" into oc-dr1-dev
Phil Burk [Wed, 24 May 2017 16:59:02 +0000 (09:59 -0700)]
aaudio: close MMAP stream if client dies
Notify client when audio service dies. Clear connection.
Notify AAudio service when client dies. Close client streams.
Use sp<> to track ServiceStreams.
Bug:
38267698
Test: test_no_close.cpp
Change-Id: I5f1699ed3b8b7bd960947c0028a89ca8419ce7a0
Yin-Chia Yeh [Fri, 30 Jun 2017 02:01:17 +0000 (02:01 +0000)]
Merge "Camera: adjust inflight list warning threshold" into oc-dr1-dev am:
d3d419feb1
am:
88b7a5160d
Change-Id: I027fe5ffc103939c4fcb3132f029acee85d28055
Yin-Chia Yeh [Fri, 30 Jun 2017 01:57:20 +0000 (01:57 +0000)]
Merge "Camera: adjust inflight list warning threshold" into oc-dr1-dev
am:
d3d419feb1
Change-Id: I77be1ace63c71f85f5be2355c28be143ebc2b1e7
Yin-Chia Yeh [Fri, 30 Jun 2017 01:51:47 +0000 (01:51 +0000)]
Merge "Camera: adjust inflight list warning threshold" into oc-dr1-dev
Phil Burk [Fri, 30 Jun 2017 00:28:15 +0000 (00:28 +0000)]
Merge "aaudio: prevent apps from affecting a stream they do not own" into oc-dr1-dev am:
1fa57e8d31
am:
ea0a0fb6d9
Change-Id: Ibd60e8fb62affab0305afd62610b6f5668c72222
Phil Burk [Fri, 30 Jun 2017 00:23:43 +0000 (00:23 +0000)]
Merge "aaudio: prevent apps from affecting a stream they do not own" into oc-dr1-dev
am:
1fa57e8d31
Change-Id: Ic8e80ec58642f63f38a002659dd7a2680c233656
Phil Burk [Fri, 30 Jun 2017 00:18:17 +0000 (00:18 +0000)]
Merge "aaudio: prevent apps from affecting a stream they do not own" into oc-dr1-dev
Yin-Chia Yeh [Thu, 29 Jun 2017 20:22:12 +0000 (13:22 -0700)]
Camera: adjust inflight list warning threshold
Test: logspew is gone, CTS
Bug:
63113636
Change-Id: Id663dbdb80439e80ca268986051a8196b31db227
Eino-Ville Talvala [Thu, 29 Jun 2017 19:28:54 +0000 (19:28 +0000)]
Merge changes from topic 'b/
62420820' into oc-dr1-dev am:
1c19ca6879
am:
f31d60c5e2
Change-Id: Ic6e5b8d935c9afa22ddf56d5ce6f0138621e25f1
Eino-Ville Talvala [Thu, 29 Jun 2017 19:25:22 +0000 (19:25 +0000)]
Merge changes from topic 'b/
62420820' into oc-dr1-dev
am:
1c19ca6879
Change-Id: I448a1f3b9745ba30369296eac35393b3dc9940d3
TreeHugger Robot [Thu, 29 Jun 2017 19:20:11 +0000 (19:20 +0000)]
Merge changes from topic 'b/
62420820' into oc-dr1-dev
* changes:
Camera: Device 3: Ignore buffer limits when clearing request queue
Camera: fix status tracker race condition
Phil Burk [Fri, 23 Jun 2017 21:51:14 +0000 (14:51 -0700)]
aaudio: prevent apps from affecting a stream they do not own
Bug:
62951648
Test: need test that hacks a stream handle from another user ID
Change-Id: I342f2a4cf9350c949f346b3c867d7f9e035c76b4
Sanna Catherine de Treville Wager [Thu, 29 Jun 2017 15:24:48 +0000 (15:24 +0000)]
Merge "Reports buffer period glitch timestamps and intervals"
Andy Hung [Thu, 29 Jun 2017 05:17:22 +0000 (05:17 +0000)]
Merge "AAudioService: add dumpsys capability" into oc-dr1-dev am:
f3ffd1ced8
am:
50df310980
Change-Id: I5cbd6b933b1d5e984bf09bfa7128c5e37b71ff33
Andy Hung [Thu, 29 Jun 2017 05:12:32 +0000 (05:12 +0000)]
Merge "AAudioService: add dumpsys capability" into oc-dr1-dev
am:
f3ffd1ced8
Change-Id: Ie37c2afd972dd448e57728858ddf07274e050f9a
Andy Hung [Thu, 29 Jun 2017 05:04:07 +0000 (05:04 +0000)]
Merge "AAudioService: add dumpsys capability" into oc-dr1-dev
Chris Thornton [Thu, 29 Jun 2017 03:14:54 +0000 (03:14 +0000)]
Merge "prevent preempting overlapping sound trigger audio streams" into oc-dr1-dev am:
81ccb8fec9
am:
105ab1ea0c
Change-Id: Ied9d5c45fadbeac3db295eff7faec837f0538c14
Chris Thornton [Thu, 29 Jun 2017 03:11:25 +0000 (03:11 +0000)]
Merge "prevent preempting overlapping sound trigger audio streams" into oc-dr1-dev
am:
81ccb8fec9
Change-Id: I92b99ae16f642f2bd8acf44dc5b7e36e473c5804
TreeHugger Robot [Thu, 29 Jun 2017 03:03:44 +0000 (03:03 +0000)]
Merge "prevent preempting overlapping sound trigger audio streams" into oc-dr1-dev
Eino-Ville Talvala [Wed, 21 Jun 2017 23:07:25 +0000 (16:07 -0700)]
Camera: Device 3: Ignore buffer limits when clearing request queue
When abortCaptures is called, the request queue is cleared; as part of that,
any requests with input buffers trigger the removal and return of one input
buffer from the input stream.
However, if the HAL currently is processing some number of reprocess
requests, the stream's max buffer limit may have been reached, in
which case getInputBuffer will block until the HAL returns an input
buffer. This stalls flushing (and calling of capture_request) for
some time, and seems to cause problems for the HAL during the flush.
So instead, don't respect the HAL's max buffer limit when all we're
doing is throwing work away.
Test: CTS, manual testing
Bug:
62420820
Change-Id: I72d8cdaf67fb3cc6876a03cee9e0021d95cecdfe
Zhijun He [Thu, 29 Jun 2017 00:14:44 +0000 (00:14 +0000)]
Merge "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align"" into oc-dr1-dev am:
5f1b1e7c18
am:
27ee1373f2
Change-Id: I5685dd9c1cb773ef28c22da2b857b7abf571998f
Zhijun He [Thu, 29 Jun 2017 00:10:40 +0000 (00:10 +0000)]
Merge "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align"" into oc-dr1-dev
am:
5f1b1e7c18
Change-Id: I6364ba88311ddd046e0b2abe95d9c8847472af8a
Zhijun He [Thu, 29 Jun 2017 00:06:03 +0000 (00:06 +0000)]
Merge "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align"" into oc-dr1-dev
Zhijun He [Thu, 29 Jun 2017 00:04:25 +0000 (00:04 +0000)]
Revert "media: Globaly adjust timestamp to make sure all tracks' time are align"
This reverts commit
40855085232566727e31de1ca8199275c6e2b393.
Change-Id: If41a07089a36eec95bcf1b2e14a5747f7733b6f5
Andy Hung [Tue, 27 Jun 2017 01:28:00 +0000 (18:28 -0700)]
AAudioService: add dumpsys capability
Test: adb shell dumpsys media.aaudio
Bug:
38396780
Change-Id: I8b5c421bdd1b3228d8140816a68740709aa9757b
Jean-Michel Trivi [Wed, 28 Jun 2017 21:51:00 +0000 (21:51 +0000)]
Merge "Audio policy: fix volume change on DEVICE_OUT_SPEAKER_SAFE" into oc-dr1-dev am:
888fd19ac4
am:
a2c2cbc00c
Change-Id: I4f50dfc7bdff3805831b54cb7105b3a65fca280b
Jean-Michel Trivi [Wed, 28 Jun 2017 21:44:02 +0000 (21:44 +0000)]
Merge "Audio policy: fix volume change on DEVICE_OUT_SPEAKER_SAFE" into oc-dr1-dev
am:
888fd19ac4
Change-Id: I2c14211333dc49f279f11efe7aa7afb942fc4f18
TreeHugger Robot [Wed, 28 Jun 2017 21:33:00 +0000 (21:33 +0000)]
Merge "Audio policy: fix volume change on DEVICE_OUT_SPEAKER_SAFE" into oc-dr1-dev
Yin-Chia Yeh [Wed, 28 Jun 2017 00:13:33 +0000 (17:13 -0700)]
Camera: fix status tracker race condition
Request thread may race with disconnect call when device is
disconnected in error condition. Acquire mLock when camera
device is updating status tracker to prevent that race
(status tracker being freed and then updated).
In other places where status tracker is updated, there is
a promoted sp to guarantee status tracker remain alive during
the call.
Test: CTS, manual camera testing
Bug:
62420820
Change-Id: Id894b5d3482c64125c114f79dbe746c56048fcbe
Yin-Chia Yeh [Wed, 28 Jun 2017 20:40:03 +0000 (20:40 +0000)]
Camera: fix camera status after HAL crash am:
fad3228356
am:
950aa2b0f6
Change-Id: Ie5ef9e41056329c5d25f089e2a5bf49b3d836eef
TreeHugger Robot [Wed, 28 Jun 2017 20:37:26 +0000 (20:37 +0000)]
Merge "cas: convert MediaCas to HIDL"
Yin-Chia Yeh [Wed, 28 Jun 2017 20:36:24 +0000 (20:36 +0000)]
Camera: fix camera status after HAL crash
am:
fad3228356
Change-Id: I84ed9d5adfb5e47e11bee6ce52fccee98d30e24c
Chris Thornton [Wed, 28 Jun 2017 04:26:07 +0000 (21:26 -0700)]
prevent preempting overlapping sound trigger audio streams
If the sound trigger hal indicates that concurrent_capture is true, the
stream should not be preempted when when another sound trigger stream is
opened.
Test: Verify that multiple streams are not closed when triggered by
different engines.
Bug:
35956563
Change-Id: I3d5df136403e47fcc1280f63b25216f326b74d6f
Yin-Chia Yeh [Wed, 28 Jun 2017 02:04:48 +0000 (19:04 -0700)]
Camera: fix camera status after HAL crash
When camera HAL dies and cameraserver is still alive, make sure
we update camera status after HAL re-register itself.
Test: kill hal process and run camera app, CTS
Bug:
63058983
Change-Id: Iba7e6cbebb674994c905f7feb1776acc479b612f
Hangyu Kuang [Wed, 28 Jun 2017 16:55:10 +0000 (16:55 +0000)]
media: Globaly adjust timestamp to make sure all tracks' time are align am:
4085508523
am:
40170e0db4
Change-Id: I09f1c1a45efdd88d94167e8e63ffdfa18837f884
Hangyu Kuang [Wed, 28 Jun 2017 16:51:40 +0000 (16:51 +0000)]
media: Globaly adjust timestamp to make sure all tracks' time are align
am:
4085508523
Change-Id: Ifcf7260d8a6f425800d08efb59ac15b64809d2c3
Sanna Catherine de Treville Wager [Fri, 23 Jun 2017 16:10:15 +0000 (09:10 -0700)]
Reports buffer period glitch timestamps and intervals
Test: dumpsys media.log
Change-Id: I3f386fdfc997f14cc825aa7f39e86488ccf0fcd2
Hangyu Kuang [Fri, 23 Jun 2017 23:23:14 +0000 (16:23 -0700)]
media: Globaly adjust timestamp to make sure all tracks' time are align
This workaround should be removed once implement edit list.
Bug:
62533717
Test: Camera Recording
Change-Id: Id2eb0c3bcb829bb4e48336fada74c0bfc951b304
Andy Hung [Wed, 28 Jun 2017 04:27:26 +0000 (04:27 +0000)]
Merge "Fix IAAudioService interface" into oc-dr1-dev am:
efa8da08f3
am:
9f5dc42b13
Change-Id: Ia926b281f7e6220ec144dd294b926741309cfcce
Andy Hung [Wed, 28 Jun 2017 04:23:58 +0000 (04:23 +0000)]
Merge "Fix IAAudioService interface" into oc-dr1-dev
am:
efa8da08f3
Change-Id: I58d1aef86c53bd5d128db847b5098e2a88adaa6f
Andy Hung [Wed, 28 Jun 2017 04:20:21 +0000 (04:20 +0000)]
Merge "Fix IAAudioService interface" into oc-dr1-dev
Jean-Michel Trivi [Wed, 28 Jun 2017 02:38:42 +0000 (19:38 -0700)]
Audio policy: fix volume change on DEVICE_OUT_SPEAKER_SAFE
When changing stream volume, compare given device and current device
for stream both as filtered through Volume::getDeviceForVolume.
This behavior matters for Android devices playing notifications and
ringtones on the AUDIO_DEVICE_OUT_SPEAKER_SAFE, which is filtered
out for volumes (see Volume.h for getDeviceForVolume() method).
Test: play a ringtone and modify volume with vol keys
Bug:
63004956
Change-Id: I139099f34e0ab091fd0ea761c75949656549f77a
OSDN Git Service
