OSDN Git Service

android-x86/frameworks-av.git
6 years agoaudioflinger: prevent crash in MmapThreadHandle destructor
Phil Burk [Thu, 3 Aug 2017 19:02:00 +0000 (12:02 -0700)]
audioflinger: prevent crash in MmapThreadHandle destructor

The mThread smart pointer was getting cleared while the
thread was still in use.

Bug: 64316921
Test: use input_monitor.cpp, see bug for repro steps
Change-Id: I46095b4e67648208a2fb979696fc2d655432448b

6 years agoMerge "aaudio: legacy reports EXCLUSIVE when not" into oc-mr1-dev
Phil Burk [Thu, 3 Aug 2017 03:39:54 +0000 (03:39 +0000)]
Merge "aaudio: legacy reports EXCLUSIVE when not" into oc-mr1-dev

6 years agoMerge "aaudio: update state for legacy mode" 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

6 years agoMerge "libmedia: Fix channelMaskFromString function" 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

6 years agoMerge "media: Increase the maximum ctts offset to be 2 seconds." into oc-dr1-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

6 years agoMerge "media: Increase the maximum ctts offset to be 2 seconds." into oc-dr1-dev
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

6 years agoaaudio: update state for legacy mode
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

6 years agoMerge "aaudio: improve accuracy of timestamps" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 00:15:00 +0000 (00:15 +0000)]
Merge "aaudio: improve accuracy of timestamps" into oc-mr1-dev

6 years agoaaudio: legacy reports EXCLUSIVE when not
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

6 years agomedia: Increase the maximum ctts offset to be 2 seconds.
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

6 years agolibmedia: Fix channelMaskFromString function
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

6 years agoMerge "libaudiohal: When starting write, consider the stream buffer size" into oc...
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

6 years agoMerge "IMediaMetadataRetriever: Remove implicit display size resize logic" into oc...
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

6 years agoaaudio: improve accuracy of timestamps
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

6 years agolibaudiohal: When starting write, consider the stream buffer size
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

6 years agoIMediaMetadataRetriever: Remove implicit display size resize logic
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

6 years agoMerge "AImageReader: Add support for private format" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 23:40:01 +0000 (23:40 +0000)]
Merge "AImageReader: Add support for private format" into oc-mr1-dev

6 years agoAImageReader: Add support for private format
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

6 years agoMerge "Have the Surface class track the buffer age." into oc-mr1-dev
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

6 years agoDO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am: 72feab...
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

6 years agoDO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am: 72feab...
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

6 years agoDO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am: 72feab...
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

6 years agoDO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused.
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

6 years agoMerge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev
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

6 years agoMerge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev
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

6 years agoGenericSource: reset timed text/subtitle after seek
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

6 years agoMerge "SoftFlacDecoder: increase default input size to 32768" into oc-dr1-dev
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

6 years agoMerge "SoftFlacDecoder: increase default input size to 32768" into oc-dr1-dev
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

6 years agoHave the Surface class track the buffer age.
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)

6 years agoaaudio: fix getXRunCount
Phil Burk [Mon, 31 Jul 2017 13:58:06 +0000 (13:58 +0000)]
aaudio: fix getXRunCount
am: faeb8b20e8

Change-Id: I5df65477820b7297479f4cf1f41ec1d5c92cff77

6 years agoaaudio: fix getXRunCount
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

6 years agoDO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused.
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

6 years agoMerge "aaudio: add glitch detection to loopback, improve latency check" into oc-dr1-dev
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

6 years agoMerge "aaudio: add glitch detection to loopback, improve latency check" into oc-dr1-dev
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

6 years agoMerge "Fix the UAF bug caused by a dead stack variable" 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

6 years agoMerge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev
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

6 years agoMerge "aaudio: remove AAUDIO_ from clock ids for autodocs" into oc-mr1-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

6 years agoaaudio: add glitch detection to loopback, improve latency check
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

6 years agoMerge "Camera: add proper nullptr check" into oc-dr1-dev
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

6 years agoMerge "Camera: add proper nullptr check" into oc-dr1-dev
Yin-Chia Yeh [Thu, 27 Jul 2017 23:11:00 +0000 (23:11 +0000)]
Merge "Camera: add proper nullptr check" into oc-dr1-dev

6 years agoCamera: add proper nullptr check
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

6 years agoMerge "Organize header dependencies" into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 04:13:32 +0000 (04:13 +0000)]
Merge "Organize header dependencies" into oc-mr1-dev

6 years agoAudioFlinger: fix set parameters on mmap streams
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

6 years agoFix the UAF bug caused by a dead stack variable
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

6 years agoAudioFlinger: fix set parameters on mmap streams
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

6 years agoMerge "Allow getrandom() in media.codec process" into oc-dr1-dev
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

6 years agoMerge "Allow getrandom() in media.codec process" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 19:53:42 +0000 (19:53 +0000)]
Merge "Allow getrandom() in media.codec process" into oc-dr1-dev

6 years agoMerge "fix output nFilledLen when prepareForAdaptivePlayback is true" into oc-mr1-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

6 years agoaudiopolicy: do not check for mode_in_communication for voip flags
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

6 years agoAllow getrandom() in media.codec process
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

6 years agoaudiopolicy: do not check for mode_in_communication for voip flags
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>
6 years agoaaudio: remove AAUDIO_ from clock ids for autodocs
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

6 years agoRevert float capability for downmixer
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

6 years agoOrganize header dependencies
Pawin Vongmasa [Wed, 19 Jul 2017 18:24:56 +0000 (11:24 -0700)]
Organize header dependencies

Header files that are exported are moved to a specific place for
exporting.

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 63821829

Change-Id: Ia578e3c0dd1ff157335b3a49af896acb922586e8

6 years agoMerge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev
Andy Hung [Tue, 25 Jul 2017 02:31:38 +0000 (02:31 +0000)]
Merge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev
am: db5beef4cf

Change-Id: Ifeac95fa06d0160abf2215b84321be4a8823e31b

6 years agoMerge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev
Andy Hung [Tue, 25 Jul 2017 02:25:08 +0000 (02:25 +0000)]
Merge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev

6 years agofix output nFilledLen when prepareForAdaptivePlayback is true
Ram Mohan [Mon, 3 Jul 2017 11:37:44 +0000 (17:07 +0530)]
fix output nFilledLen when prepareForAdaptivePlayback is true

Bug:63560919
Bug:62894603

Change-Id: If1fbd17ebc63743f88c3cbaf2b47a6ee726e06e8

6 years agoMerge "Camera: fix emulator deadlock" into oc-dr1-dev
Yin-Chia Yeh [Mon, 24 Jul 2017 23:26:26 +0000 (23:26 +0000)]
Merge "Camera: fix emulator deadlock" into oc-dr1-dev
am: 84201fee0b

Change-Id: Ie036606deb823fb8c33954fa76d37eee6d403e96

6 years agoMerge "Camera: fix emulator deadlock" into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 23:23:51 +0000 (23:23 +0000)]
Merge "Camera: fix emulator deadlock" into oc-dr1-dev

6 years agoMerge "Build libmedia_omx with BOARD_VNDK_VERSION" into oc-mr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 22:46:17 +0000 (22:46 +0000)]
Merge "Build libmedia_omx with BOARD_VNDK_VERSION" into oc-mr1-dev

6 years agoMediaPlayer: Permit VolumeShaper operations on gapless playback
Andy Hung [Fri, 21 Jul 2017 23:42:41 +0000 (16:42 -0700)]
MediaPlayer: Permit VolumeShaper operations on gapless playback

This allows unducking to occur when VolumeShaper operations
are applied to the original player.

Test: Automated duck tests
Bug: 63111689
Change-Id: If2e93b1ccb11216032f24e71ab200668e1e4850d

6 years agoMerge "Camera: fix race in disconnect and deleteStream" into oc-dr1-dev
Yin-Chia Yeh [Mon, 24 Jul 2017 20:45:15 +0000 (20:45 +0000)]
Merge "Camera: fix race in disconnect and deleteStream" into oc-dr1-dev
am: ef00a24944

Change-Id: I4addf62e75478d8a2d9d707ed81974c5306998ed

6 years agoMerge "Camera: fix race in disconnect and deleteStream" into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 20:36:06 +0000 (20:36 +0000)]
Merge "Camera: fix race in disconnect and deleteStream" into oc-dr1-dev

6 years agoCamera: fix emulator deadlock
Yin-Chia Yeh [Mon, 24 Jul 2017 18:37:23 +0000 (11:37 -0700)]
Camera: fix emulator deadlock

Test: Emulator FastBasicTest 100 iteration, CTS on real device
Bug: 63933389
Change-Id: I27013d64a9cb29cb95591dc0598afbb59ac96290

6 years agoBuild libmedia_omx with BOARD_VNDK_VERSION
Jiyong Park [Fri, 21 Jul 2017 08:25:46 +0000 (17:25 +0900)]
Build libmedia_omx with BOARD_VNDK_VERSION

Add dependency to libstagefright_headers.

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j libmedia_omx
Change-Id: Ia97a981d4cd04acbdc3df6dac63db3f18af21a03

6 years agoCamera: fix race in disconnect and deleteStream
Yin-Chia Yeh [Thu, 20 Jul 2017 23:05:29 +0000 (16:05 -0700)]
Camera: fix race in disconnect and deleteStream

Check and return buffers to just deleted streams.
Also disallow deleteStream when camera runs into error to
simplify the stream lifecycle when error happens.

Test: CTS, manual tests
Bug: 63863140
Change-Id: I476737442041aebd393ec05998969d959cda0228

6 years agoMerge "Camera: Avoid freeing outstanding input buffers" into oc-dr1-dev
Emilian Peev [Fri, 21 Jul 2017 16:10:56 +0000 (16:10 +0000)]
Merge "Camera: Avoid freeing outstanding input buffers" into oc-dr1-dev
am: b2bae26bf4

Change-Id: Ie15f3783ce62a4fb24af2abf3f335ffa50b7688e

6 years agoMerge "Camera: Avoid freeing outstanding input buffers" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 16:05:00 +0000 (16:05 +0000)]
Merge "Camera: Avoid freeing outstanding input buffers" into oc-dr1-dev

7 years agoMerge "aaudio: reduce glitching by improving sleep timing" into oc-dr1-dev
Phil Burk [Fri, 21 Jul 2017 03:36:13 +0000 (03:36 +0000)]
Merge "aaudio: reduce glitching by improving sleep timing" into oc-dr1-dev
am: d937a5cf85

Change-Id: Ic8e3f97c88ec2197a6d66a48eb091d8eea166891

7 years agoMerge "aaudio: reduce glitching by improving sleep timing" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 03:31:06 +0000 (03:31 +0000)]
Merge "aaudio: reduce glitching by improving sleep timing" into oc-dr1-dev

7 years agoSoftFlacDecoder: increase default input size to 32768
Wei Jia [Tue, 11 Jul 2017 21:37:25 +0000 (14:37 -0700)]
SoftFlacDecoder: increase default input size to 32768

Test: works for flac files
Bug: 63292860
Change-Id: I097f17148f86b98a249a3567cfdfae6001469586
(cherry picked from commit fd69fd3ee29bc61d2aee0161ce113dca7953d46f)

7 years agoaaudio: reduce glitching by improving sleep timing
Phil Burk [Wed, 19 Jul 2017 14:03:52 +0000 (07:03 -0700)]
aaudio: reduce glitching by improving sleep timing

ALways sleep a minimum time to avoid busy wait in real-time thread.
Account for wakeup jitter in threads on the other side of a FIFO.
Avoid race condition that caused a longer sleep than necessary.
Fix calculation of mFreeRunning for capture mode.

Also added systrace logging, which was used to debug this.

Bug: 63814792
Test: Run GStomper on Walleye with MMAP on, see bug
Change-Id: I7b20098580ff454365425bd21e43c17ade532a0a

7 years agoCamera: Avoid freeing outstanding input buffers
Emilian Peev [Wed, 19 Jul 2017 01:21:26 +0000 (18:21 -0700)]
Camera: Avoid freeing outstanding input buffers

The producer end can disconnect at any time which
will trigger the freeing of the input buffer. If
any input buffers are outstanding and being processed
by the camera device freeing them can cause stability
issues.

Bug: 63682712
Test: Manual using application.
Change-Id: I25da97786d75e82b1b13dce34953de597bea9b2e

7 years agoMerge "Camera3Device: Don't time out on long exposures" into oc-dr1-dev
Eino-Ville Talvala [Thu, 20 Jul 2017 17:43:18 +0000 (17:43 +0000)]
Merge "Camera3Device: Don't time out on long exposures" into oc-dr1-dev
am: 57cd4032c0

Change-Id: I494687696489d9e5ab57bd420dc6fb594bb392e7

7 years agoMerge "Camera3Device: Don't time out on long exposures" into oc-dr1-dev
Eino-Ville Talvala [Thu, 20 Jul 2017 17:37:41 +0000 (17:37 +0000)]
Merge "Camera3Device: Don't time out on long exposures" into oc-dr1-dev

7 years agoMerge "Move xmlparser to under libstagefright"
TreeHugger Robot [Thu, 20 Jul 2017 03:26:45 +0000 (03:26 +0000)]
Merge "Move xmlparser to under libstagefright"

7 years agoMerge "Add non-treble IOMXStore interface"
TreeHugger Robot [Thu, 20 Jul 2017 03:26:37 +0000 (03:26 +0000)]
Merge "Add non-treble IOMXStore interface"

7 years agoMerge "Remove unused symbolic links to OMX header files"
TreeHugger Robot [Thu, 20 Jul 2017 03:26:31 +0000 (03:26 +0000)]
Merge "Remove unused symbolic links to OMX header files"

7 years agoMerge "Camera: fix deadlock with flush" into oc-dr1-dev am: 679b6f6eaa
Yin-Chia Yeh [Thu, 20 Jul 2017 00:41:37 +0000 (00:41 +0000)]
Merge "Camera: fix deadlock with flush" into oc-dr1-dev am: 679b6f6eaa
am: 9e0561a787

Change-Id: I688acc2229679fab0ae38f4c256619a96c0f291b

7 years agoMerge "Camera: fix deadlock with flush" into oc-dr1-dev
Yin-Chia Yeh [Thu, 20 Jul 2017 00:34:21 +0000 (00:34 +0000)]
Merge "Camera: fix deadlock with flush" into oc-dr1-dev
am: 679b6f6eaa

Change-Id: I9fa7a09448ff4b61584e91d04ba974c48e2f4854

7 years agoMerge "Camera: fix deadlock with flush" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Camera: fix deadlock with flush" into oc-dr1-dev

7 years agoincrease OWNERS to the audio/video team
Lajos Molnar [Wed, 19 Jul 2017 23:40:25 +0000 (16:40 -0700)]
increase OWNERS to the audio/video team

Change-Id: If3bf0b99162b55ab5a745264134de9f3db6b8311

7 years agoaudioflinger: enable volume listener on direct outputs am: 3e4de77666
Eric Laurent [Wed, 19 Jul 2017 22:51:33 +0000 (22:51 +0000)]
audioflinger: enable volume listener on direct outputs am: 3e4de77666
am: 31b16502cf

Change-Id: I0fc13815954933454665dd3765f88be7a863e7a7

7 years agoaudioflinger: enable volume listener on direct outputs
Eric Laurent [Wed, 19 Jul 2017 22:47:44 +0000 (22:47 +0000)]
audioflinger: enable volume listener on direct outputs
am: 3e4de77666

Change-Id: I4be0cd0d693626c9049583942239fdd35b2e53c6

7 years agoMove xmlparser to under libstagefright
Pawin Vongmasa [Tue, 11 Jul 2017 00:31:11 +0000 (17:31 -0700)]
Move xmlparser to under libstagefright

Test: make cts -j123 && cts-tradefed run cts-dev --module \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 37657124
Change-Id: Ib78f983635586558b99850b2fd54143b0a418d1d

7 years agoAdd non-treble IOMXStore interface
Pawin Vongmasa [Tue, 11 Jul 2017 02:19:07 +0000 (19:19 -0700)]
Add non-treble IOMXStore interface

Test: Compiles
Bug: 37657124
Change-Id: If1c800ff0560357c6d0d380a83e7e77f621f93da

7 years agoRemove unused symbolic links to OMX header files
Pawin Vongmasa [Wed, 19 Jul 2017 01:29:19 +0000 (18:29 -0700)]
Remove unused symbolic links to OMX header files

Test: Compiles
Bug: 63821829
Change-Id: I11f29e5390470c0c8fe30683444d07d450f6fe23

7 years agoMerge "Use int32_t instead of off_t when necessary." am: cf6eb0a136 am: 5c38332e6b...
Dan Albert [Wed, 19 Jul 2017 21:43:49 +0000 (21:43 +0000)]
Merge "Use int32_t instead of off_t when necessary." am: cf6eb0a136 am: 5c38332e6b am: 088db676d6
am: a617486fd9

Change-Id: I5cedd6d7fa82bb7f24c005cb656184c3b2a7ff03

7 years agoMerge "Use int32_t instead of off_t when necessary." am: cf6eb0a136 am: 5c38332e6b
Dan Albert [Wed, 19 Jul 2017 21:40:47 +0000 (21:40 +0000)]
Merge "Use int32_t instead of off_t when necessary." am: cf6eb0a136 am: 5c38332e6b
am: 088db676d6

Change-Id: I10336a928394e7f646cb14fde9eb9bae0b9e2452

7 years agoMerge "Use int32_t instead of off_t when necessary." am: cf6eb0a136
Dan Albert [Wed, 19 Jul 2017 21:37:19 +0000 (21:37 +0000)]
Merge "Use int32_t instead of off_t when necessary." am: cf6eb0a136
am: 5c38332e6b

Change-Id: I041150af148d5dda6e5abbb375d6213980521bae

7 years agoMerge "Use int32_t instead of off_t when necessary."
Dan Albert [Wed, 19 Jul 2017 21:34:17 +0000 (21:34 +0000)]
Merge "Use int32_t instead of off_t when necessary."
am: cf6eb0a136

Change-Id: Id68c84efd00693f3b0d11e4385a12debced4c1aa

7 years agoMerge "Use int32_t instead of off_t when necessary."
Treehugger Robot [Wed, 19 Jul 2017 21:26:22 +0000 (21:26 +0000)]
Merge "Use int32_t instead of off_t when necessary."

7 years agoaudioflinger: enable volume listener on direct outputs
Eric Laurent [Sun, 16 Jul 2017 23:55:08 +0000 (16:55 -0700)]
audioflinger: enable volume listener on direct outputs

Always allow effects with no process function on any output
thread type as there is no impact on performance and no risk of
the audio properties not being supported by the effect.

Bug: 63015903
Test: place a Skype call over SCO and verify the volume listener
can be created.

Change-Id: I99db7802cec88a618808e500b74f4c78165199fe

7 years agoCamera: fix deadlock with flush
Yin-Chia Yeh [Wed, 19 Jul 2017 01:09:57 +0000 (18:09 -0700)]
Camera: fix deadlock with flush

Test: CTS, run testReprocessAbort 50 times
Bug: 63701864
Change-Id: Id41b68da143c9292437f35f8960ce4f80b9d59f7

7 years agoMerge "Marshal Metrics"
John Bruce [Wed, 19 Jul 2017 17:33:46 +0000 (17:33 +0000)]
Merge "Marshal Metrics"

7 years agoMerge "Add owner"
Marco Nelissen [Wed, 19 Jul 2017 17:31:58 +0000 (17:31 +0000)]
Merge "Add owner"

7 years agoAdd owner
Marco Nelissen [Wed, 19 Jul 2017 17:30:17 +0000 (10:30 -0700)]
Add owner

for drm includes

Change-Id: I8a471a75f9cbbb48494c0bc16766f6aecb804edd

7 years agoMerge "Close all open drm sessions before destroying a plugin."
TreeHugger Robot [Wed, 19 Jul 2017 17:08:38 +0000 (17:08 +0000)]
Merge "Close all open drm sessions before destroying a plugin."

7 years agoUse int32_t instead of off_t when necessary.
Dan Albert [Mon, 17 Jul 2017 20:37:56 +0000 (13:37 -0700)]
Use int32_t instead of off_t when necessary.

Test: make checkbuild
Bug: https://github.com/android-ndk/ndk/issues/459
Change-Id: I72528ca13d1f82debec977efbab62e638b000dfc

7 years agoMerge "Write audio performance data to file"
Sanna Catherine de Treville Wager [Wed, 19 Jul 2017 03:04:57 +0000 (03:04 +0000)]
Merge "Write audio performance data to file"