OSDN Git Service
Phil Burk [Thu, 3 Aug 2017 22:25:43 +0000 (15:25 -0700)]
aaudio: restore _get and _setSamplesPerFrame()
This restores some deprecated functions that some released apps
were calling. Restored:
AAudioStreamBuilder_setSamplesPerFrame()
AAudioStream_getSamplesPerFrame()
Bug:
64346279
Test: put GStomper in AAudio mode using its Settings on Marlin
Change-Id: I2749a06cded9fc3863d233713efda2674cf7f5e3
Zhijun He [Fri, 4 Aug 2017 01:46:14 +0000 (01:46 +0000)]
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev
am:
dcca7ebd8b
Change-Id: Iaa6232308cbca7ebb61d43c76df9e15e6ef19b1c
Zhijun He [Fri, 4 Aug 2017 01:38:28 +0000 (01:38 +0000)]
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev
Zhijun He [Fri, 4 Aug 2017 00:57:35 +0000 (17:57 -0700)]
Revert "media: Increase the maximum ctts offset to be 2 seconds."
This reverts commit
414708370eeb5379c1ec869455ede9e086dc8ef4.
The original CL caused video timestamp bug.
Bug:
64357813
Change-Id: I5171ef7287fe8db063949f5bfff305c6c3ae20b7
Andy Hung [Fri, 4 Aug 2017 00:58:40 +0000 (00:58 +0000)]
Merge "AudioTrackShared: Log more detail on fatal errors" into oc-dr1-dev
am:
c8adbea083
Change-Id: I6e183fe47b885c94b632335da5cc6727e972c3e0
Andy Hung [Fri, 4 Aug 2017 00:47:25 +0000 (00:47 +0000)]
Merge "AudioTrackShared: Log more detail on fatal errors" into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 23:07:41 +0000 (23:07 +0000)]
Merge "Fix failure to check HIDL return status" into oc-mr1-dev
Dongwon Kang [Thu, 3 Aug 2017 21:59:29 +0000 (21:59 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28 am:
7e9fe019ff am:
58db80184a am:
064c64340a am:
3996238b97 am:
a164342ccc am:
b579ff3a0e
am:
d0538c82ea
Change-Id: I5c36b400f75ffe46d44b8c77991bd22c370f986b
Dongwon Kang [Thu, 3 Aug 2017 21:48:18 +0000 (21:48 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28 am:
7e9fe019ff am:
58db80184a am:
064c64340a am:
3996238b97 am:
a164342ccc
am:
b579ff3a0e
Change-Id: I4acef1155296c82ce7e582aa7c8b6de1dcea3e72
Wei Jia [Thu, 3 Aug 2017 21:35:58 +0000 (21:35 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c am:
2df7cd6571 am:
64e7c6089f am:
739585fb8d am:
a3df50b011 am:
189c8ca25f am:
72eca8ab5a
am:
d31c726b72
Change-Id: Id25ae65ea5f2c89672327f178658b3a40637744f
Dongwon Kang [Thu, 3 Aug 2017 21:35:56 +0000 (21:35 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28 am:
7e9fe019ff am:
58db80184a am:
064c64340a am:
3996238b97
am:
a164342ccc
Change-Id: I7f61bf6b993e82acb7107b97f5da1c7ec91aa8a3
Wei Jia [Thu, 3 Aug 2017 21:31:27 +0000 (21:31 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c am:
2df7cd6571 am:
64e7c6089f am:
739585fb8d am:
a3df50b011 am:
189c8ca25f
am:
72eca8ab5a
Change-Id: I6f7ad02307b203c462ff00b0ab534dc1c696e0de
Dongwon Kang [Thu, 3 Aug 2017 21:31:26 +0000 (21:31 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28 am:
7e9fe019ff am:
58db80184a am:
064c64340a
am:
3996238b97
Change-Id: Ia35b0f602f3d002df244b2baec8fb72ebb4280f3
Wei Jia [Thu, 3 Aug 2017 21:24:56 +0000 (21:24 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c am:
2df7cd6571 am:
64e7c6089f am:
739585fb8d am:
a3df50b011
am:
189c8ca25f
Change-Id: I90d4a5f82a27f1ad19af965b04576b3837910b58
Dongwon Kang [Thu, 3 Aug 2017 21:24:54 +0000 (21:24 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28 am:
7e9fe019ff am:
58db80184a
am:
064c64340a
Change-Id: Ie0b3d067a3039215b6678baa4ba22248e16c0582
Wei Jia [Thu, 3 Aug 2017 21:19:24 +0000 (21:19 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c am:
2df7cd6571 am:
64e7c6089f am:
739585fb8d
am:
a3df50b011
Change-Id: I014932315c3b489fc23b9fe50949cbfc8f680c83
Dongwon Kang [Thu, 3 Aug 2017 21:19:24 +0000 (21:19 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28 am:
7e9fe019ff
am:
58db80184a
Change-Id: Ib156d3acbe9ebdd1407ad5896b3ece25f6c9a9ea
Dongwon Kang [Thu, 3 Aug 2017 21:15:00 +0000 (21:15 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e am:
995ffd91a4 am:
464af3dc2e am:
e7aba4ca81 am:
962ea2d280 am:
852e902636 am:
3a8976ce36
am:
168cbf6cab
Change-Id: Id59a53dbb3f917b047de090e19ec840c2c4c272b
Wei Jia [Thu, 3 Aug 2017 21:14:54 +0000 (21:14 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c am:
2df7cd6571 am:
64e7c6089f
am:
739585fb8d
Change-Id: I5d72f60baaed58bf9deaaefc8b3a607de9a04e11
Dongwon Kang [Thu, 3 Aug 2017 21:14:54 +0000 (21:14 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c am:
8dd4d58d28
am:
7e9fe019ff
Change-Id: I89c184722d4c937b0ea99204fe11bcd5a1f170af
Dongwon Kang [Thu, 3 Aug 2017 21:08:52 +0000 (21:08 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e am:
995ffd91a4 am:
464af3dc2e am:
e7aba4ca81 am:
962ea2d280 am:
852e902636
am:
3a8976ce36
Change-Id: I1d4ed7d11aac63e93a69d70eb6093e984165d2a5
Dongwon Kang [Thu, 3 Aug 2017 21:08:52 +0000 (21:08 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c
am:
8dd4d58d28
Change-Id: Ie7d200d4c74a91ce8f4a7c8d4e91ff71d0d1d12e
Wei Jia [Thu, 3 Aug 2017 21:08:24 +0000 (21:08 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c am:
2df7cd6571
am:
64e7c6089f
Change-Id: I08e269ad2cc21c8411d79b8ca4901aa1c9cce580
Dongwon Kang [Thu, 3 Aug 2017 21:03:23 +0000 (21:03 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e am:
995ffd91a4 am:
464af3dc2e am:
e7aba4ca81 am:
962ea2d280
am:
852e902636
Change-Id: I730b14907f8544b361bb0f7f7bc608d953494f81
Wei Jia [Thu, 3 Aug 2017 21:03:22 +0000 (21:03 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95 am:
b31373e62c
am:
2df7cd6571
Change-Id: Idf2a4fa0b847e8ef6fefdb55fc4fc11d5fcde342
Dongwon Kang [Thu, 3 Aug 2017 21:03:21 +0000 (21:03 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70
am:
20ff47b39c
Change-Id: I75981256fe8a29ff53e6018064d705ec6d1be71e
Dongwon Kang [Thu, 3 Aug 2017 20:57:24 +0000 (20:57 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e am:
995ffd91a4 am:
464af3dc2e am:
e7aba4ca81
am:
962ea2d280
Change-Id: Ifc1b1f4bf3fb547e0ef56d771eb462afaf8487ac
Wei Jia [Thu, 3 Aug 2017 20:57:24 +0000 (20:57 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95
am:
b31373e62c
Change-Id: I4266df6693d6f6e261e5959f8006f658be57d656
Dongwon Kang [Thu, 3 Aug 2017 20:57:21 +0000 (20:57 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56
am:
73c41f9d70
Change-Id: I12556bc1f16c13abfe7018a9c21258c73e46c7a0
Dongwon Kang [Thu, 3 Aug 2017 20:51:21 +0000 (20:51 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e am:
995ffd91a4 am:
464af3dc2e
am:
e7aba4ca81
Change-Id: Id20d06c65ff8ee2a223591182f34253cfe932bc3
Dongwon Kang [Thu, 3 Aug 2017 20:51:21 +0000 (20:51 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
am:
a7a43d9b56
Change-Id: If7a317b2a9de1daaafb83aeb466c52ef494b972d
Wei Jia [Thu, 3 Aug 2017 20:51:20 +0000 (20:51 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f
am:
fa7be9da95
Change-Id: Icc90b2c750e5d75697579cb98532d0667280dced
Wei Jia [Thu, 3 Aug 2017 20:45:52 +0000 (20:45 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e
am:
218692ec4f
Change-Id: I5abf7e89e0476f46492ca3166ff2245d70e87068
Dongwon Kang [Thu, 3 Aug 2017 20:45:51 +0000 (20:45 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e am:
995ffd91a4
am:
464af3dc2e
Change-Id: Ia1cd21978199447253de057599b26c8d187d31cf
TreeHugger Robot [Thu, 3 Aug 2017 20:44:43 +0000 (20:44 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 20:39:51 +0000 (20:39 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9 am:
5b6106b02e
am:
995ffd91a4
Change-Id: If56ea7ccce2d7689a2dd674f04ab303f4aed2226
Wei Jia [Thu, 3 Aug 2017 20:39:50 +0000 (20:39 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60
am:
067ab2f74e
Change-Id: Id86327d63b5b8aa3edc62b7e6c15689b6ef4afa7
Dongwon Kang [Thu, 3 Aug 2017 20:34:20 +0000 (20:34 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d am:
3b8c1df6e9
am:
5b6106b02e
Change-Id: I4dbc87895ab8bb7ac44c8f8a1c82efeee73786d1
Wei Jia [Thu, 3 Aug 2017 20:34:20 +0000 (20:34 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d
am:
bbc5c8fc60
Change-Id: I0844a8bac332664d4d8e668257c470b0a89addfe
Dongwon Kang [Thu, 3 Aug 2017 20:27:49 +0000 (20:27 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5 am:
1e3070e56d
am:
3b8c1df6e9
Change-Id: I73dc7e47baecddf4d9df119b324aad3fe0bbf144
Wei Jia [Thu, 3 Aug 2017 20:27:48 +0000 (20:27 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376
am:
96114e7c5d
Change-Id: I8616480a004aa44e947939db7e5b8cce1b7ec72a
Dongwon Kang [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
Merge "Skip track if verification fails" into mnc-dev am:
6168d8eba5
am:
1e3070e56d
Change-Id: Iefa80b90d92ab9f14364eeb77b5cb2608f919496
Wei Jia [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
MPEG4Source: fix fragmented read.
am:
6b401a3376
Change-Id: I14b767357500d6680379c34ad74efdab1d7bb6ee
Dongwon Kang [Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)]
Merge "Skip track if verification fails" into mnc-dev
am:
6168d8eba5
Change-Id: Ic098164694aaea4a455e95f5fe4e662bfa832ce7
Dongwon Kang [Thu, 3 Aug 2017 19:58:37 +0000 (19:58 +0000)]
Merge "Skip track if verification fails" into mnc-dev
Jeff Tinker [Wed, 26 Jul 2017 22:44:33 +0000 (15:44 -0700)]
Fix failure to check HIDL return status
Test: run Play Movies and repeat killing
android.hardware.drm@1.0-service.widevine, check
log for transaction failed messages. This uncovered
a related problem in closeSession which is also fixed
in this CL.
bug:
64022042
Change-Id: I4e86414aa1625c35689339389391e9fa6d377b1c
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.
Test: passed CTS test DecoderTest#testDecodeFragmented
Bug:
64314728
Bug:
36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit
ba9af7792dfed6e9b1b216aab91a97e713eec891)
Andy Hung [Thu, 3 Aug 2017 01:10:00 +0000 (18:10 -0700)]
AudioTrackShared: Log more detail on fatal errors
Test: basic audio use regression test
Bug:
63868320
Change-Id: Ia4caba9a878b308e6fa0c96ec124443cd96f125f
Phil Burk [Thu, 3 Aug 2017 03:39:54 +0000 (03:39 +0000)]
Merge "aaudio: legacy reports EXCLUSIVE when not" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 03:27:29 +0000 (03:27 +0000)]
Merge "aaudio: update state for legacy mode" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 03:15:33 +0000 (03:15 +0000)]
Merge "libmedia: Fix channelMaskFromString function" into oc-mr1-dev
Hangyu Kuang [Thu, 3 Aug 2017 00:58:32 +0000 (00:58 +0000)]
Merge "media: Increase the maximum ctts offset to be 2 seconds." into oc-dr1-dev
am:
71ee06d081
Change-Id: I03ec3608afae7ecd5b21bdc20a025e1a7e583db8
Hangyu Kuang [Thu, 3 Aug 2017 00:52:23 +0000 (00:52 +0000)]
Merge "media: Increase the maximum ctts offset to be 2 seconds." into oc-dr1-dev
Phil Burk [Fri, 28 Jul 2017 22:12:13 +0000 (15:12 -0700)]
aaudio: update state for legacy mode
Add logging to the loopback test.
Update state in the callback.
Implement AAudioStreamRecord::getFramesWritten().
Bug:
62781173
Bug:
64214193
Test: aaudio_loopback.cpp, look for STARTED state while running
Change-Id: Iba867d048dcfcafe6db1d095abe2766f1aabe608
TreeHugger Robot [Thu, 3 Aug 2017 00:15:00 +0000 (00:15 +0000)]
Merge "aaudio: improve accuracy of timestamps" into oc-mr1-dev
Phil Burk [Wed, 2 Aug 2017 22:07:21 +0000 (15:07 -0700)]
aaudio: legacy reports EXCLUSIVE when not
Legacy streams could return EXCLUSIVE from getSharingMode()
if requested by caller. But that is not supported.
To avoid misleading developers, we force it to SHARED mode.
Bug:
63355841
Test: setprop aaudio.mmap_exclusive_policy 2 && write_sine -x -pn
Change-Id: I91c82b63293752c6aa2c4933cd2bfe8c6d41a5d3
Hangyu Kuang [Wed, 2 Aug 2017 21:05:25 +0000 (14:05 -0700)]
media: Increase the maximum ctts offset to be 2 seconds.
Bug:
63590381
Test: camera recording
Change-Id: I020cdecfafeedd3f138a54f8d3ff7c5712f611b1
Mikhail Naganov [Wed, 2 Aug 2017 20:44:06 +0000 (13:44 -0700)]
libmedia: Fix channelMaskFromString function
Fix erroneous "!found1 || !found2 => miss" condition to
"!found1 && !found2 => miss".
Bug:
64130154
Test: VTS
Change-Id: I8f8527428eb70e7f177ad440a696c1ec7c7668e0
TreeHugger Robot [Wed, 2 Aug 2017 19:52:51 +0000 (19:52 +0000)]
Merge "libaudiohal: When starting write, consider the stream buffer size" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 19:14:18 +0000 (19:14 +0000)]
Merge "IMediaMetadataRetriever: Remove implicit display size resize logic" into oc-mr1-dev
Phil Burk [Fri, 21 Jul 2017 22:59:44 +0000 (15:59 -0700)]
aaudio: improve accuracy of timestamps
Account for latency added by the AAudio service.
Fix input timestamps.
Bug:
37080396
Test: test_timestamps.cpp input_monitor.cpp
Change-Id: I1053cd21af722bb9b9371df4e5731bf4a0a57b0b
Mikhail Naganov [Wed, 2 Aug 2017 00:20:24 +0000 (17:20 -0700)]
libaudiohal: When starting write, consider the stream buffer size
When starting writing into a stream, use the bigger value from
the requested bytes to write and the stream buffer size.
This fixes a corner case when offload playback starts close
to the end of the track, and then jumps to the middle.
Bug:
63979005
Test: checked HAL logs for the repro case,
confirmed that Loopback, PM, YT, Camcoder, still work, also over BT
Change-Id: I924468619d2185fd679b739747c423babfb36ada
Hangyu Kuang [Tue, 1 Aug 2017 01:06:54 +0000 (18:06 -0700)]
IMediaMetadataRetriever: Remove implicit display size resize logic
Bug:
62198298
Test: CTS test
Change-Id: I1a6d2cf59291f37474724067d747703e08ff1325
TreeHugger Robot [Tue, 1 Aug 2017 23:40:01 +0000 (23:40 +0000)]
Merge "AImageReader: Add support for private format" into oc-mr1-dev
Jiwen 'Steve' Cai [Wed, 12 Apr 2017 22:56:41 +0000 (15:56 -0700)]
AImageReader: Add support for private format
The private format was unsupported in API24, but since API26 added
getAHardwareBuffer for AImageReader, the format becomes useful now. It
maps to HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED defined in
<system/graphics.h>.
This CL also updates the supported format/usage combination with the
rule that if format is AIMAGE_FORMAT_PRIVATE, neither CPU_READ or
CPU_READ_OFTEN is supported.
Bug:
37097572
Test: AImageReaderCts, Graphics CTS
Change-Id: Ide3db8c6ceb4504d6f198ea1d9526edecc3a56ad
TreeHugger Robot [Tue, 1 Aug 2017 17:31:34 +0000 (17:31 +0000)]
Merge "Have the Surface class track the buffer age." into oc-mr1-dev
Wei Jia [Tue, 1 Aug 2017 14:52:47 +0000 (14:52 +0000)]
DO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am:
72feab63b5 -s ours am:
76945790ac -s ours am:
36dc8cd573 -s ours
am:
cab827ee4b -s ours
Change-Id: Id6112533d2faf5cf58439bc016ea4ed17f411baf
Wei Jia [Tue, 1 Aug 2017 14:49:17 +0000 (14:49 +0000)]
DO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am:
72feab63b5 -s ours am:
76945790ac -s ours
am:
36dc8cd573 -s ours
Change-Id: Ia6f1f443aea6c5ee016497de7bcf10bbec1c9ecf
Wei Jia [Tue, 1 Aug 2017 14:46:19 +0000 (14:46 +0000)]
DO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am:
72feab63b5 -s ours
am:
76945790ac -s ours
Change-Id: Ic2a5954da41f7087ac7c0ade7be53045fa90dcde
Wei Jia [Tue, 1 Aug 2017 14:36:16 +0000 (14:36 +0000)]
DO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused.
am:
72feab63b5 -s ours
Change-Id: I43ceb52bd09ee3b1c00912f4c2d63a5eaf7b091b
Robert Shih [Tue, 1 Aug 2017 02:41:01 +0000 (02:41 +0000)]
Merge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev
am:
87b901caa1
Change-Id: I643afacd79bd58c7acf1873db0cd1b01f09089b9
TreeHugger Robot [Tue, 1 Aug 2017 02:37:44 +0000 (02:37 +0000)]
Merge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev
Robert Shih [Mon, 31 Jul 2017 23:44:39 +0000 (16:44 -0700)]
GenericSource: reset timed text/subtitle after seek
Bug:
62071488
Test: MediaPlayerTest#testSeekWithTimedText
Change-Id: I789c22d186a601d57b4d5ad0d7945590714796a3
Oliver Woodman [Mon, 31 Jul 2017 17:44:33 +0000 (17:44 +0000)]
Merge "SoftFlacDecoder: increase default input size to 32768" into oc-dr1-dev
am:
a2208f7d01
Change-Id: I51929a9aeaf16aed260fde34b038cec47f493289
Oliver Woodman [Mon, 31 Jul 2017 17:37:43 +0000 (17:37 +0000)]
Merge "SoftFlacDecoder: increase default input size to 32768" into oc-dr1-dev
Ian Elliott [Tue, 18 Jul 2017 21:53:06 +0000 (15:53 -0600)]
Have the Surface class track the buffer age.
This change corresponds to a change between the Surface and
BufferQueueProducer classes.
Have the Surface class track the buffer age, so that Surface::query()
can return the buffer age without having to use a binder call to
BufferQueueProducer::query(). The idea is for
BufferQueueProducer::dequeueBuffer() to return the value, which the
Surface class will cache for later use by Surface::query().
Bug: b/
27903668
Test: Use systrace to no ensure query binder call after dequeueBuffer.
Change-Id: I78ff3d2d639111705c25a92f3672b7e6d0fac19f
(cherry picked from commit
ee9ddeff468484061c5c8df1368867cd31ec09d5)
Phil Burk [Mon, 31 Jul 2017 13:58:06 +0000 (13:58 +0000)]
aaudio: fix getXRunCount
am:
faeb8b20e8
Change-Id: I5df65477820b7297479f4cf1f41ec1d5c92cff77
Phil Burk [Tue, 25 Jul 2017 22:15:07 +0000 (15:15 -0700)]
aaudio: fix getXRunCount
Mixer was not advancing FIFO when underflowed so the client could not
detect the xrun.
Also underruns could cause the stream to drift in time relative to other
streams.
Bug:
64033855
Test: trigger underruns by sleeping in a callback
Change-Id: Ia038f5048ffbff3b82e9d86e6807483dfe6879d0
Wei Jia [Tue, 18 Jul 2017 18:00:40 +0000 (11:00 -0700)]
DO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused.
Test: audio decoder stops polling source
Bug:
63412809
Change-Id: I53c98920ea850defae88b2e12be6b05d6d90c32c
Phil Burk [Fri, 28 Jul 2017 18:17:47 +0000 (18:17 +0000)]
Merge "aaudio: add glitch detection to loopback, improve latency check" into oc-dr1-dev
am:
d478859f02
Change-Id: Ic2e44eebd2ef8110321799b01597714b0c0a12e8
TreeHugger Robot [Fri, 28 Jul 2017 18:02:49 +0000 (18:02 +0000)]
Merge "aaudio: add glitch detection to loopback, improve latency check" into oc-dr1-dev
Pawin Vongmasa [Fri, 28 Jul 2017 03:10:43 +0000 (03:10 +0000)]
Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev
am:
3afa6a5f86
Change-Id: I91a738228413f1d2a90dfa27483f612fa604a46d
TreeHugger Robot [Fri, 28 Jul 2017 02:57:28 +0000 (02:57 +0000)]
Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev
Phil Burk [Fri, 28 Jul 2017 00:21:18 +0000 (00:21 +0000)]
Merge "aaudio: remove AAUDIO_ from clock ids for autodocs" into oc-mr1-dev
Phil Burk [Fri, 14 Jul 2017 15:25:08 +0000 (08:25 -0700)]
aaudio: add glitch detection to loopback, improve latency check
Also improve automatic loop gain control for latency testing.
Use ArgParser to parse command line options.
Bug:
38178592
Test: this is a test
Change-Id: Idfe8f25544a3e7c74ee15be008bf34e3a0741455
Yin-Chia Yeh [Thu, 27 Jul 2017 23:24:11 +0000 (23:24 +0000)]
Merge "Camera: add proper nullptr check" into oc-dr1-dev
am:
4b5215993a
Change-Id: I326e2ded58282529a58df7091b4124531dcf1e7a
Yin-Chia Yeh [Thu, 27 Jul 2017 23:11:00 +0000 (23:11 +0000)]
Merge "Camera: add proper nullptr check" into oc-dr1-dev
Yin-Chia Yeh [Thu, 27 Jul 2017 19:47:03 +0000 (12:47 -0700)]
Camera: add proper nullptr check
Test: CTS
Bug:
64118349
Change-Id: I2fd5c3f32d4e13560a88f4657c4f25faedd869ba
TreeHugger Robot [Thu, 27 Jul 2017 04:13:32 +0000 (04:13 +0000)]
Merge "Organize header dependencies" into oc-mr1-dev
Eric Laurent [Thu, 27 Jul 2017 01:52:33 +0000 (01:52 +0000)]
AudioFlinger: fix set parameters on mmap streams
am:
e6e9a4811d
Change-Id: I557a5a8272f606cd4264f7efbe65e10af64a1f6c
Pawin Vongmasa [Wed, 26 Jul 2017 23:42:54 +0000 (16:42 -0700)]
Fix the UAF bug caused by a dead stack variable
The original code attempts to copy data from a location pointed to by a
local variable that has gone out of scope. This CL moves the copy
operation into the scope.
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
63773604
Change-Id: I980630b6ac30875c2df65664668d4d6b7414f3a7
Eric Laurent [Wed, 26 Jul 2017 02:26:02 +0000 (19:26 -0700)]
AudioFlinger: fix set parameters on mmap streams
Bug:
63935167
Test: Verify capture from USB mic on mmap input stream
Change-Id: I416eb90ef0e9d51d54f6450c374c086ab078d288
Pawin Vongmasa [Wed, 26 Jul 2017 20:16:54 +0000 (20:16 +0000)]
Merge "Allow getrandom() in media.codec process" into oc-dr1-dev
am:
dfcfad27da
Change-Id: I3bb353d97ba7e82127b9786080c1fe3f120edfec
TreeHugger Robot [Wed, 26 Jul 2017 19:53:42 +0000 (19:53 +0000)]
Merge "Allow getrandom() in media.codec process" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:19:32 +0000 (18:19 +0000)]
Merge "fix output nFilledLen when prepareForAdaptivePlayback is true" into oc-mr1-dev
David Lin [Wed, 26 Jul 2017 18:03:27 +0000 (18:03 +0000)]
audiopolicy: do not check for mode_in_communication for voip flags
am:
72ad4b91d6
Change-Id: I742803dd00cdd5bcbdf23b99bb6b415f3f118def
Pawin Vongmasa [Wed, 26 Jul 2017 11:06:28 +0000 (04:06 -0700)]
Allow getrandom() in media.codec process
Test: Run camera-fast-front-back-switch.sh in the bug
Bug:
63907147
Change-Id: I65d3fe66d9cd9663e431db4a56bc66f6c06a0548
David Lin [Wed, 26 Jul 2017 06:46:47 +0000 (23:46 -0700)]
audiopolicy: do not check for mode_in_communication for voip flags
Some VoIP clients may choose to open the streams as soon as the phone
state is set to MODE_RINGTONE to allow lower start latency when the call
is connected. This patch removes the unnecessary check conditions for
MODE_IN_COMMUNICATION since the stream type is sufficient indicator for
setting the flags for VoIP calls.
Bug:
62782025
Test: manual voip mo and mt calls tests
Change-Id: Idc7e1b6f33921580c0937dee71b2b2105cbd31eb
Signed-off-by: David Lin <dtwlin@google.com>
Phil Burk [Wed, 26 Jul 2017 00:33:47 +0000 (17:33 -0700)]
aaudio: remove AAUDIO_ from clock ids for autodocs
Use CLOCK_MONOTONIC instead of AAUDIO_CLOCK_MONOTONIC
Bug:
63915257
Test: Look at the generated autodocs.
Change-Id: I856da9ba4139833bcaef6873e87a3ef58e6ace69
rago [Tue, 25 Jul 2017 18:25:49 +0000 (11:25 -0700)]
Revert float capability for downmixer
Revert floating point processing on downmixer.
This commits partially reverts
d7d013446a64c6de9f0f2dfe098a721b140e0b48
Bug:
63760315
Test: Play multichannel movie
Change-Id: I16edf8767e02ef5d8ff63f52e8d1222ce0d09e22
OSDN Git Service
