OSDN Git Service

android-x86/frameworks-av.git
6 years agoMerge "audioflinger: do not call onTearDown() in threadLoop_exit()" into oc-mr1-dev
Phil Burk [Thu, 28 Sep 2017 15:55:24 +0000 (15:55 +0000)]
Merge "audioflinger: do not call onTearDown() in threadLoop_exit()" into oc-mr1-dev

6 years agoaudioflinger: do not call onTearDown() in threadLoop_exit()
Phil Burk [Wed, 27 Sep 2017 20:51:41 +0000 (13:51 -0700)]
audioflinger: do not call onTearDown() in threadLoop_exit()

This is just for MmapThread.
This change will prevent a recursive mutex lock when the teardown calls
stop() on the stream.

Bug: 66971139
Test: unplug headphones with aaudio-echo, see bugreport
Change-Id: I904a8e575bbc5ae8b03350c061dd23cba62783f0

6 years agoMerge "Camera: don't hold memory map lock during callback" into oc-mr1-dev
TreeHugger Robot [Tue, 26 Sep 2017 20:36:49 +0000 (20:36 +0000)]
Merge "Camera: don't hold memory map lock during callback" into oc-mr1-dev

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5f...
Julien Desprez [Tue, 26 Sep 2017 17:29:00 +0000 (17:29 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f am: 35c28bb88f am: c2b8b3f072 am: 0e4a89e436
am: fbf55f744a

Change-Id: I87b131a0444f83fdec3c05efde00e8c1056d67b9

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5f...
Julien Desprez [Tue, 26 Sep 2017 17:27:00 +0000 (17:27 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f am: 35c28bb88f am: c2b8b3f072
am: 0e4a89e436

Change-Id: I57e3b1d15ffd012e2346fc394d4a701b49ef0754

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5f...
Julien Desprez [Tue, 26 Sep 2017 17:24:32 +0000 (17:24 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f am: 35c28bb88f
am: c2b8b3f072

Change-Id: I90cce4197d2537e4821607c9948f07086e51f070

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5f...
Julien Desprez [Tue, 26 Sep 2017 17:22:29 +0000 (17:22 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f
am: 35c28bb88f

Change-Id: I2971472558c986121f134bde112ca57829d19cea

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb
Julien Desprez [Tue, 26 Sep 2017 17:20:31 +0000 (17:20 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb
am: af93be238f

Change-Id: Id023ae01a22e71617b898c8ce2c65ccae6ca295a

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539
Julien Desprez [Tue, 26 Sep 2017 17:17:59 +0000 (17:17 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539
am: 8dc2a5fdfb

Change-Id: I2679093d7a32ac111cf674dc357ac32853a99b81

6 years agoRevert "Make stagefright command available for STS tests."
Julien Desprez [Tue, 26 Sep 2017 17:15:31 +0000 (17:15 +0000)]
Revert "Make stagefright command available for STS tests."
am: 4197479539

Change-Id: I3fd20c38c33720d6e0824022976fb2db21eb6419

6 years agoRevert "Make stagefright command available for STS tests."
Julien Desprez [Tue, 26 Sep 2017 17:02:21 +0000 (17:02 +0000)]
Revert "Make stagefright command available for STS tests."

Bug: 66943976
This reverts commit e286ff463b46ca987562adc9b24d49f1ee191b92.

Change-Id: I9704307962d86e82baf0215b60fadeaa1cc470df

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am...
Andres Celis [Mon, 25 Sep 2017 22:41:52 +0000 (22:41 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582 am: 15052a13c1 am: c29da42e23 am: 9ab0a4da85
am: f35ee5186c

Change-Id: I8426fbf133c87dffcc2e5ec8f0a9f6156e660e33

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am...
Andres Celis [Mon, 25 Sep 2017 22:39:23 +0000 (22:39 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582 am: 15052a13c1 am: c29da42e23
am: 9ab0a4da85

Change-Id: I8f774a856e7137bb0d46548611bd0cb4732c88fd

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am...
Andres Celis [Mon, 25 Sep 2017 22:35:49 +0000 (22:35 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582 am: 15052a13c1
am: c29da42e23

Change-Id: I02da406a30367840f32d2112d1b4dc7f2babaeb2

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am...
Andres Celis [Mon, 25 Sep 2017 22:31:20 +0000 (22:31 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582
am: 15052a13c1

Change-Id: I9d74a9914420bbf71203f8c79ad09eeca77e3d2f

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e
Andres Celis [Mon, 25 Sep 2017 22:29:19 +0000 (22:29 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e
am: 80a9c17582

Change-Id: I41d392a8930721fce8359a6814d8db8ff7859d5f

6 years agoMake stagefright command available for STS tests. am: e286ff463b
Andres Celis [Mon, 25 Sep 2017 22:27:19 +0000 (22:27 +0000)]
Make stagefright command available for STS tests. am: e286ff463b
am: ef136ff97e

Change-Id: I64167e4b7aaca441a13d33667a519c0ffd8899d2

6 years agoMake stagefright command available for STS tests.
Andres Celis [Mon, 25 Sep 2017 22:24:49 +0000 (22:24 +0000)]
Make stagefright command available for STS tests.
am: e286ff463b

Change-Id: I3ad4b941d5aebce2bf33f621b872e9ce0dc72ac1

6 years agoMerge "Camera NDK: fix release image failure during destructor" into oc-mr1-dev
TreeHugger Robot [Fri, 22 Sep 2017 20:55:30 +0000 (20:55 +0000)]
Merge "Camera NDK: fix release image failure during destructor" into oc-mr1-dev

6 years agoCamera: don't hold memory map lock during callback
Yin-Chia Yeh [Fri, 22 Sep 2017 18:32:53 +0000 (11:32 -0700)]
Camera: don't hold memory map lock during callback

Test: partner stress tests
Bug: 66691828
Change-Id: I2f0048293380f0a89ba46c441c1d77bae8aec7be

6 years agoMerge "softFlac: handle eos buffers at any stage" into oc-mr1-dev
TreeHugger Robot [Fri, 22 Sep 2017 03:54:39 +0000 (03:54 +0000)]
Merge "softFlac: handle eos buffers at any stage" into oc-mr1-dev

6 years agoMerge "audioflinger: volume control to HAL for VoIP streams" into oc-mr1-dev
TreeHugger Robot [Fri, 22 Sep 2017 02:07:55 +0000 (02:07 +0000)]
Merge "audioflinger: volume control to HAL for VoIP streams" into oc-mr1-dev

6 years agoCamera NDK: fix release image failure during destructor
Yin-Chia Yeh [Wed, 20 Sep 2017 00:28:25 +0000 (17:28 -0700)]
Camera NDK: fix release image failure during destructor

Test: new CTS test that close reader with images in
      acquired state
Bug: 65839749

Change-Id: Iac9d2b1a3298ca619f2ab71a02641052f9a51f2e

6 years agosoftFlac: handle eos buffers at any stage
Ram Mohan [Fri, 15 Sep 2017 14:52:36 +0000 (20:22 +0530)]
softFlac: handle eos buffers at any stage

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Host \
-l INFO

Bug: 63796949

Change-Id: I528b4bc041aab8affc28cb7d1b96ea6065754798

6 years agoaudioflinger: volume control to HAL for VoIP streams
Eric Laurent [Thu, 21 Sep 2017 00:54:22 +0000 (17:54 -0700)]
audioflinger: volume control to HAL for VoIP streams

Do not apply stream volume in software for special VoIP output
stream mixers but send it to the HAL instead.

Bug: 64392515.
Test: Fi calls
Change-Id: I698a1a0ad17d672d09187529dcbc5d259284e4af

6 years agoMerge "Remove codec aggregation/summarization" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Sep 2017 15:03:28 +0000 (15:03 +0000)]
Merge "Remove codec aggregation/summarization" into oc-mr1-dev

6 years agoMerge "add media.metrics tracking of fatal codec errors" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Sep 2017 14:56:01 +0000 (14:56 +0000)]
Merge "add media.metrics tracking of fatal codec errors" into oc-mr1-dev

6 years agoRemove codec aggregation/summarization
Ray Essick [Wed, 20 Sep 2017 23:36:33 +0000 (16:36 -0700)]
Remove codec aggregation/summarization

The aggregation, which tries to collect info for standard deviation,
used a 64-bit counter. But with a 4GB video file, when you square the
bytecount, you quickly run up against the 64 bit limit.
So we won't be aggregating those records any longer on-device.

Bug: 66226775
Test: dumpsys media.metrics -summary, no aggregated codec lines
Change-Id: I7c8347eba3d48dfd3b26916e9eb76de1c129817f

6 years agoadd media.metrics tracking of fatal codec errors
Ray Essick [Tue, 19 Sep 2017 18:48:35 +0000 (11:48 -0700)]
add media.metrics tracking of fatal codec errors

add error code tracking to media metrics records for codecs.
So we can learn what's going wrong (bad data, chopped data, bad code,
etc).

Bug: 65250664
Test: ran good/bad media through codecs, read 'dumpsys media.metrics'
Change-Id: Ia46bdff865fb6c965f669e4189c7be5dbc1598fe

6 years agoMake stagefright command available for STS tests.
Andres Celis [Wed, 20 Sep 2017 20:24:48 +0000 (13:24 -0700)]
Make stagefright command available for STS tests.

Bug:65246490
Change-Id: If34d5e625181bd81bc112b1c9b519b2c0891740b

6 years agoMerge "Blur media.metrics timestamps for privacy" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 20:17:39 +0000 (20:17 +0000)]
Merge "Blur media.metrics timestamps for privacy" into oc-mr1-dev

6 years agoMerge "trim packagename if sideloaded, get versioncode" into oc-mr1-dev
Ray Essick [Wed, 20 Sep 2017 16:08:48 +0000 (16:08 +0000)]
Merge "trim packagename if sideloaded, get versioncode" into oc-mr1-dev

6 years agotrim packagename if sideloaded, get versioncode
Ray Essick [Tue, 19 Sep 2017 16:27:31 +0000 (09:27 -0700)]
trim packagename if sideloaded, get versioncode

implement policy of not uploading package info when sideloaded
or through a non-playstore channel. Include versioncode information
when we do include a particular package.

Bug: 65027506
Test: watch logs and dumpsys for various package combinations
Change-Id: I8e601c899070b57c25181ba705e997f10ea052b4

6 years agoMerge "Camera service: Add support for camera.device@3.3" into oc-mr1-dev
Eino-Ville Talvala [Tue, 19 Sep 2017 15:53:44 +0000 (15:53 +0000)]
Merge "Camera service: Add support for camera.device@3.3" into oc-mr1-dev

6 years agoMerge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 01:14:06 +0000 (01:14 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev

6 years agoFix various AAudio device selection issues
Eric Laurent [Fri, 15 Sep 2017 03:06:42 +0000 (20:06 -0700)]
Fix various AAudio device selection issues

Bug: 65292224
- Audio policy manager should not use an unavailable device when an explicit
route is requested. This causes a device selection made by a client to
become sticky after device disconnection.

Bug: 64945845
- Remove spurious device change callback occuring after registering a
new client to audio server by creating a specific configuration event
for client registration.
- Do not keep strong references to device callback interfaces in
AudioTrack, AudioRecord and AudioSystem.
- Do not update selected device in AudioTrack and AudioRecord when
not active as the new device selection on the stream is because of other
clients activity which is not relevant to an inactive client.

Bug: 65693340
- Fix missing increment of SessionRoute ref count in getInputForAttr() for
MMAP inputs

Test: AAudio CTS tests

Change-Id: I2a01b02e8b064d352004f6065495fd99aee55745

6 years agoRename "bitrate-control" to "bitrate-modes"
Pawin Vongmasa [Sat, 16 Sep 2017 13:49:48 +0000 (06:49 -0700)]
Rename "bitrate-control" to "bitrate-modes"

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

Bug: 65769027
Change-Id: I09e92841daffdb09d9e236d590462f345f7a1ed8

6 years agoaaudio: fix audioserver crash when starting a stream is rejected
Phil Burk [Fri, 15 Sep 2017 18:39:15 +0000 (11:39 -0700)]
aaudio: fix audioserver crash when starting a stream is rejected

Bug: 65738271
Test: repeat when not root:   input_monitor  -m2 -pl
Change-Id: I98659dbd78a75785565b1b6f0254a48220253af6

6 years agoaaudio: keep track of streams using strong pointers
Phil Burk [Wed, 13 Sep 2017 20:03:08 +0000 (13:03 -0700)]
aaudio: keep track of streams using strong pointers

Maintain strong pointer to service stream during service calls.
Use simple AAudioStreamTracker instead of complex HandleTracker.

Bug: 65280854
Test: affects all MMAP streams, run all CTS tests, etcetera
Change-Id: I3d2ed8b588ea39c216dacd4dea503b11c33f36f3

6 years agoCamera service: Add support for camera.device@3.3
Eino-Ville Talvala [Mon, 21 Aug 2017 23:12:50 +0000 (16:12 -0700)]
Camera service: Add support for camera.device@3.3

Support overriding the dataSpace field if the HAL does so.

Test: Camera CTS passes
Bug: 62358514
Change-Id: I4c22237ebbf8c54afc0d0b202098f6530d8ec7f8

6 years agoMerge "Fix error handling for unknown codecs" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 03:27:24 +0000 (03:27 +0000)]
Merge "Fix error handling for unknown codecs" into oc-mr1-dev

6 years agoFix error handling for unknown codecs
Pawin Vongmasa [Thu, 14 Sep 2017 23:51:26 +0000 (16:51 -0700)]
Fix error handling for unknown codecs

Test: Cast screen from Play Movies to the device under test

Bug: 65486376
Change-Id: Ia4a2ea6cc03255734043d6455f549b6a8e13561f

6 years agoMerge "Fixed energy computation for eq and bass boost" into oc-mr1-dev
Ricardo Garcia [Thu, 14 Sep 2017 21:07:51 +0000 (21:07 +0000)]
Merge "Fixed energy computation for eq and bass boost" into oc-mr1-dev

6 years agoMerge "Fix aosp generic fallback configuration sample rate" into oc-mr1-dev
Kevin Rocard [Thu, 14 Sep 2017 16:43:24 +0000 (16:43 +0000)]
Merge "Fix aosp generic fallback configuration sample rate" into oc-mr1-dev

6 years agoMerge "aaudio: cleaned up PlayerBase implementation" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 03:10:28 +0000 (03:10 +0000)]
Merge "aaudio: cleaned up PlayerBase implementation" into oc-mr1-dev

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Thu, 14 Sep 2017 01:12:47 +0000 (01:12 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a am: f669386ff9 am: af6aa6e3fa am: 773023ddbd am: 29cd6b306a am: 4e7855e9e2 am: 8d352347c8 am: c85b95a2fb
am: 472235afda

Change-Id: I70d7e1caa3f0a56643865f1299a15b0ec643b895

6 years agoMerge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768...
Marco Nelissen [Thu, 14 Sep 2017 01:11:57 +0000 (01:11 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768a3f03 am: 6705aadd4b am: 04cb1d7f53 am: 57f4543970 am: 4363301afe
am: 1a2e605125

Change-Id: I92bfb4e280eacc571399a2ee32e416b42af023f3

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Thu, 14 Sep 2017 00:47:53 +0000 (00:47 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a am: f669386ff9 am: af6aa6e3fa am: 773023ddbd am: 29cd6b306a am: 4e7855e9e2 am: 8d352347c8
am: c85b95a2fb

Change-Id: Ia436d657e5c3edbca6227d5af7521dca57f9a5d3

6 years agoMerge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768...
Marco Nelissen [Thu, 14 Sep 2017 00:47:18 +0000 (00:47 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768a3f03 am: 6705aadd4b am: 04cb1d7f53 am: 57f4543970
am: 4363301afe

Change-Id: Ie5f76651551906523c6413ae53ec3f002f108e1b

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 23:24:52 +0000 (23:24 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a am: f669386ff9 am: af6aa6e3fa am: 773023ddbd am: 29cd6b306a am: 4e7855e9e2
am: 8d352347c8

Change-Id: Iab2873e344de58dbefa77311d847dccc2f3f346a

6 years agoMerge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768...
Marco Nelissen [Wed, 13 Sep 2017 23:23:55 +0000 (23:23 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768a3f03 am: 6705aadd4b am: 04cb1d7f53
am: 57f4543970

Change-Id: I9360a01c8a10eac5523f7307366d232e711ae23d

6 years agoFixed energy computation for eq and bass boost
rago [Tue, 12 Sep 2017 23:52:15 +0000 (16:52 -0700)]
Fixed energy computation for eq and bass boost

Effects might give wrong energy estimate if they were disabled since
last computation.
Updated BassBoost level

Bug: 65529284
Test: manual testing with SoloTester, play music and headphone load.
Change-Id: Ieb1df935e88fed6997a663bab10d6bda8176cc57

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 22:28:53 +0000 (22:28 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a am: f669386ff9 am: af6aa6e3fa am: 773023ddbd am: 29cd6b306a
am: 4e7855e9e2

Change-Id: I052aa674864234641ded2b160aaa89f5747c7c18

6 years agoMerge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768...
Marco Nelissen [Wed, 13 Sep 2017 22:28:23 +0000 (22:28 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768a3f03 am: 6705aadd4b
am: 04cb1d7f53

Change-Id: Ib2773de7e003ab14d18e5b8c8f70e4800e0cfc63

6 years agoMerge "omx: collapse unpopulated slot messages in GraphicBufferSource" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 22:01:08 +0000 (22:01 +0000)]
Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" into oc-mr1-dev

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 21:51:29 +0000 (21:51 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a am: f669386ff9 am: af6aa6e3fa am: 773023ddbd
am: 29cd6b306a

Change-Id: I5dbd868f25eb1b135e58ea9b5031fdb80da9a1f3

6 years agoaaudio: cleaned up PlayerBase implementation
Phil Burk [Tue, 12 Sep 2017 23:25:15 +0000 (16:25 -0700)]
aaudio: cleaned up PlayerBase implementation

Simplify registration. Reduce use of virtual methods.

This CL, plus some CLs in AudioManager, should fix
crashes involving RefBase::decStrong

Bug: 65450109
Test: CTS or "write_sine_callback -m2 -pl"
Change-Id: Ie1decd20f8d44bdefb0faf92e6b74de4f72e86bd

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 21:32:58 +0000 (21:32 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a am: f669386ff9 am: af6aa6e3fa
am: 773023ddbd

Change-Id: Icb6d1e4e353b2f43b9d1539621379a5dffd84e27

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 21:08:31 +0000 (21:08 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a am: f669386ff9
am: af6aa6e3fa

Change-Id: I0fa9c9fe48ded649de267f9387a2f483b1555ebb

6 years agoMerge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768...
Marco Nelissen [Wed, 13 Sep 2017 20:47:25 +0000 (20:47 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768a3f03
am: 6705aadd4b

Change-Id: Idadacc9024cb424c771f546b4a9bdec6fff7c6b4

6 years agoMerge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b
Marco Nelissen [Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b
am: d6768a3f03

Change-Id: Iafba587d46764fb47a425d602172cb1c82636d52

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 20:20:48 +0000 (20:20 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a
am: f669386ff9

Change-Id: I15571eb5c05ea0bbf77ec5a746c989d84f38ccee

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 20:14:48 +0000 (20:14 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a
am: e42227983a

Change-Id: I9613239a8e331d3a1811ca35bba3baf3ab819abe

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 20:11:29 +0000 (20:11 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da
am: 18b22afe7a

Change-Id: Ib5d83c4bca072150c4a85905895088de4bdb8bf0

6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 20:08:20 +0000 (20:08 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev
am: 7fad4bb2da

Change-Id: I9d7c50eab930c2d6a3aadf9bc0685d6ccf870cb0

6 years agoMerge "media: Fix a typo in parsing nclc atom." into nyc-dev
Marco Nelissen [Wed, 13 Sep 2017 20:08:06 +0000 (20:08 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
am: 08ef71975b

Change-Id: I73ec3365c21238f7ca328763df52121b43911e04

6 years agoFix aosp generic fallback configuration sample rate
Kevin Rocard [Mon, 11 Sep 2017 18:18:07 +0000 (11:18 -0700)]
Fix aosp generic fallback configuration sample rate

The configuration sample rate format is restricted by the XSD.
It is supposed to be a list of number separated by commas.
In the generic configuration they was a space after a comma.

Bug: 65535343
Test: Following script:

setup() {
    BUILD_ID=$1
    TARGET_PRODUCT=$2
    TARGET_BUILD_TYPE=${3:-userdebug}
    TARGET_ARCH=${4:-arm64}
    set +x

    echo "The following three variables can be overridden" \
         "by setting the corresponding environment variable"
    set -x
    TEST_SUITES_TARGET=${VTS_TEST_SUITES_TARGET:-test_suites_${TARGET_ARCH}}
    BASE_TARGET=${VTS_BASE_TARGET:-${TARGET_PRODUCT}-${TARGET_BUILD_TYPE}}
    AOSP_TARGET=${VTS_AOSP_TARGET:-aosp_${TARGET_ARCH}_ab-${TARGET_BUILD_TYPE}}
    set +x

    download() {
        local target=$1
        local file=$2
        test -f $file ||
            /google/data/ro/projects/android/fetch_artifact --bid $BUILD_ID --target $target $file ||
            { local r=$?; rm $file; return $r; }
    }

    echo "Downloading"
    download $TEST_SUITES_TARGET 'android-vts.zip'
    download $BASE_TARGET "${TARGET_PRODUCT}-img-${BUILD_ID}.zip"
    download $AOSP_TARGET "aosp_${TARGET_ARCH}_ab-img-${BUILD_ID}.zip"

    echo "Unzipping"
    rm -r system.img android-vts
    unzip aosp_${TARGET_ARCH}_ab-img-$BUILD_ID.zip system.img
    unzip android-vts.zip

    echo "Building vbmeta without verity"
    avbtool make_vbmeta_image --flag 2 --output vbmeta.img

    set -x
    adb reboot bootloader
    fastboot update ${TARGET_PRODUCT}-img-$BUILD_ID.zip --skip-reboot
    fastboot flash vbmeta vbmeta.img || echo "Warning: Device does not support vbmeta"
    fastboot erase system
    fastboot flash system system.img
    fastboot erase metadata
    fastboot -w
    fastboot reboot

    echo "Board setup"
    echo "You may now start vts-tradefed with:"
    echo '$ ANDROID_BUILD_TOP= PATH="$PWD:$PATH" vts-tradefed'
}
VTS_TEST_SUITES_TARGET=test_suites_arm64_fastbuild3d_linux setup 4327646 sailfish

runTest() {
    ANDROID_BUILD_TOP= PATH="$PWD/android-vts/tools:$PATH" vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalAudioV2_0Target -t CheckConfig.audioPolicyConfigurationValidation
}
runTest
# Test fail as expected
adb root ; adb disable-verity ; adb reboot ; adb wait-for-device ; adb root ; adb wait-for-device ; adb remount
# Apply the patch
adb shell sed -i -e 's/8000, 16000/8000,16000/' /system/etc/primary_audio_policy_configuration.xml
rutTest
# Test succeed !

Change-Id: I2a39606cd820b5cd27a640248bf692204ec2cd71
Signed-off-by: Kevin Rocard <krocard@google.com>
6 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into...
Wonsik Kim [Wed, 13 Sep 2017 16:41:29 +0000 (16:41 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev

6 years agoMerge "Record profile, level, bytes for codecs" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 15:47:39 +0000 (15:47 +0000)]
Merge "Record profile, level, bytes for codecs" into oc-mr1-dev

6 years agoMerge "media: Fix a typo in parsing nclc atom." into nyc-dev
Marco Nelissen [Wed, 13 Sep 2017 05:01:24 +0000 (05:01 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev

6 years agoMerge "media_codecs: limit platform AVC decoder to 4080x4080 resolution" into oc...
TreeHugger Robot [Wed, 13 Sep 2017 00:29:28 +0000 (00:29 +0000)]
Merge "media_codecs: limit platform AVC decoder to 4080x4080 resolution" into oc-mr1-dev

6 years agoMerge "Avoid empty mime type in media metrics records" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 22:23:33 +0000 (22:23 +0000)]
Merge "Avoid empty mime type in media metrics records" into oc-mr1-dev

6 years agomedia_codecs: limit platform AVC decoder to 4080x4080 resolution
Lajos Molnar [Tue, 12 Sep 2017 21:36:22 +0000 (14:36 -0700)]
media_codecs: limit platform AVC decoder to 4080x4080 resolution

Bug: 65438670
Change-Id: Iad8a1c0b42ca8f58d44d892f36b7c153ab437daf

6 years agoomx: collapse unpopulated slot messages in GraphicBufferSource
Lajos Molnar [Tue, 12 Sep 2017 21:20:10 +0000 (14:20 -0700)]
omx: collapse unpopulated slot messages in GraphicBufferSource

Print one message per onBuffersReleased instead of one per each
slot.

Bug: 64452834
Change-Id: I2d849415ca05303926eb79904f00a176d5ddab32

6 years agoMerge "Camera: synchronize access to mHidlMemPoolMap" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 21:19:45 +0000 (21:19 +0000)]
Merge "Camera: synchronize access to mHidlMemPoolMap" into oc-mr1-dev

6 years agoAvoid empty mime type in media metrics records
Ray Essick [Tue, 12 Sep 2017 19:31:13 +0000 (12:31 -0700)]
Avoid empty mime type in media metrics records

Wait until later in the codec initialization / startup process to
look for and save the mime information.

Bug: 62199358
Test: re-ran scenarios with empty mime, ran code-related CTS tests
Change-Id: I7f98b40385662709a039f03b0b5f4ada06011eea

6 years agoMerge "AudioTrack, AudioRecord: Fix latency computation" into oc-mr1-dev
Andy Hung [Tue, 12 Sep 2017 18:50:16 +0000 (18:50 +0000)]
Merge "AudioTrack, AudioRecord: Fix latency computation" into oc-mr1-dev

6 years agoMerge "Allow portMode configuration in loaded state only" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 02:21:18 +0000 (02:21 +0000)]
Merge "Allow portMode configuration in loaded state only" into oc-mr1-dev

6 years agoAudioTrack, AudioRecord: Fix latency computation
Andy Hung [Tue, 12 Sep 2017 00:24:21 +0000 (17:24 -0700)]
AudioTrack, AudioRecord: Fix latency computation

Force 64 bit arithmetic to avoid integer overflow on 32 bit
platforms.

Test: CTS AudioTrackTest
Bug: 65536481
Change-Id: I774a7811fce08c7cbe59f0a062fd2c2d72220203

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:38:24 +0000 (22:38 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454 am: b995c31415 am: d08327d1a2 am: 74f84d987b am: 355a18f58d am: c8f3cf02eb am: 8cad724158 am: 122ec92c42
am: fa5a0cedea

Change-Id: I984f888d01b2ef8d79297c8fa258d9f213b9bd0b

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:35:53 +0000 (22:35 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454 am: b995c31415 am: d08327d1a2 am: 74f84d987b am: 355a18f58d am: c8f3cf02eb am: 8cad724158
am: 122ec92c42

Change-Id: Ifa8953ad8057a4d7dcddeae1793e00168ea90c58

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:33:46 +0000 (22:33 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454 am: b995c31415 am: d08327d1a2 am: 74f84d987b am: 355a18f58d am: c8f3cf02eb
am: 8cad724158

Change-Id: I1d0102e75a068bd6a2af21b9126b907703928db7

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:32:15 +0000 (22:32 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454 am: b995c31415 am: d08327d1a2 am: 74f84d987b am: 355a18f58d
am: c8f3cf02eb

Change-Id: I7c984be87df715dbc6fe5ecc44691e001d7ff09f

6 years agoMerge "Put media.metrics service into proper group" into oc-dev am: 0990056439
Ray Essick [Mon, 11 Sep 2017 22:32:15 +0000 (22:32 +0000)]
Merge "Put media.metrics service into proper group" into oc-dev am: 0990056439
am: 337a3fbbfc

Change-Id: Ib696c714a44a4f81fa87a2390794b51b3c16474b

6 years agoMerge "Put media.metrics service into proper group" into oc-dev
Ray Essick [Mon, 11 Sep 2017 22:30:15 +0000 (22:30 +0000)]
Merge "Put media.metrics service into proper group" into oc-dev
am: 0990056439

Change-Id: Ied8c03cba54639871ac175fe71df11b2b0f348c6

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:24:48 +0000 (22:24 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454 am: b995c31415 am: d08327d1a2 am: 74f84d987b
am: 355a18f58d

Change-Id: I5f3a24175f1aa70fb1f8d62a449685e9103cad18

6 years agoMerge "Put media.metrics service into proper group" into oc-dev
TreeHugger Robot [Mon, 11 Sep 2017 22:24:09 +0000 (22:24 +0000)]
Merge "Put media.metrics service into proper group" into oc-dev

6 years agoMerge "DO NOT MERGE : Add simple control request handling" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 22:21:55 +0000 (22:21 +0000)]
Merge "DO NOT MERGE : Add simple control request handling" into oc-mr1-dev

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:21:26 +0000 (22:21 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454 am: b995c31415 am: d08327d1a2
am: 74f84d987b

Change-Id: Ie2c1acfdc523c6774dd2f90e0b42a9f274731d57

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:17:17 +0000 (22:17 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454 am: b995c31415
am: d08327d1a2

Change-Id: Ia8bdb1eae19450a3c6df255945a8cded55b15909

6 years agoMerge "aaudio: prevent noise upon disconnect" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 22:16:51 +0000 (22:16 +0000)]
Merge "aaudio: prevent noise upon disconnect" into oc-mr1-dev

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:15:47 +0000 (22:15 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474 am: ae465be454
am: b995c31415

Change-Id: Iff099acd6ee928f37d2b91144a06d9c78a2a5aae

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:13:42 +0000 (22:13 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100 am: 0a8a0c4474
am: ae465be454

Change-Id: I272012f714615091a24a9d3bf8a0d2d825576bcf

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am...
Andy Hung [Mon, 11 Sep 2017 22:12:13 +0000 (22:12 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e51100
am: 0a8a0c4474

Change-Id: Icf690ebbc582d61f4369ef208aa150e2aa0c38d7

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
Andy Hung [Mon, 11 Sep 2017 22:10:43 +0000 (22:10 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
am: e472e51100

Change-Id: I82f359a057762b8b0fac97d137a2fb20083a518b

6 years agoMerge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
Andy Hung [Mon, 11 Sep 2017 22:01:44 +0000 (22:01 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev

6 years agomedia: Fix a typo in parsing nclc atom.
Hangyu Kuang [Fri, 19 Aug 2016 20:49:43 +0000 (13:49 -0700)]
media: Fix a typo in parsing nclc atom.

Bug: 30974361
bug: 64836941
Change-Id: I12a75ed30d3259d863e744fae3ccff79d8a95f39
(cherry picked from commit 51a0ff56f49faf1a19281f6d786fe18bf84794c6)

6 years agoDO NOT MERGE : Add simple control request handling
Jerry Zhang [Thu, 7 Sep 2017 18:34:25 +0000 (11:34 -0700)]
DO NOT MERGE : Add simple control request handling

Control request handling was already added in master,
but it is causing a few problems on Windows. This patch
simplifies the main patch and only responds to get
status requests with STATUS_OK. This fixes situations
where Windows stops communicating if it doesn't get a
response from this request.

Bug: 65423303
Test: Transfer files on windows
Change-Id: Ib7a53aa5b679f011b3a8ac6dff549ca051d579e0

6 years agoaaudio: prevent noise upon disconnect
Phil Burk [Wed, 6 Sep 2017 21:36:11 +0000 (14:36 -0700)]
aaudio: prevent noise upon disconnect

Also clean up the state machine handling in the data callback.
Prevent error callback sometimes being called twice for the same error.

Bug: 63342351
Bug: 63087953
Test: add sleep(2) to write_sine_callback.cpp before the requestStop()
Change-Id: I27737bcb0371052741f50bda9f65c5994ccf6fd9

6 years agoRecord profile, level, bytes for codecs
Ray Essick [Tue, 5 Sep 2017 23:52:05 +0000 (16:52 -0700)]
Record profile, level, bytes for codecs

Record the profile, level, max-width, max-height and
byte counts consumed for codecs.
Do summarization of byte-counts; the other fields are
differentiators forming the different buckets.

Bug: 65297728
Bug: 65250664
Test: observe 'dumpsys media.metrics'
Change-Id: Ie5bcfe2fd70891f8deeb116897adbb1041b799c7