OSDN Git Service

android-x86/system-media.git
7 years agoMoved libalsautils to vendor. Marked libaudioutils and libaudioroute as
Vijay Venkatraman [Tue, 9 May 2017 18:30:33 +0000 (11:30 -0700)]
Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as
vendor_available

Bug: 33241851
Bug: 37527576
Test: Build sailfish and pass CTS audio
Test: With BOARD_VNDK_VERSION:=current, no link type check
errors related to these libs

(cherry picked from commit a25465b1c46c7ac172371b523e816988dd4aa018)

Merged-In: Ifacd2305a79a50f6bf3182344bc678082047022f
Change-Id: Icb17b4266a2c6443e482efd62769dbc430e7501c

7 years agoMerge "camera: Clarify ZSL supports" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 22:26:45 +0000 (22:26 +0000)]
Merge "camera: Clarify ZSL supports" into oc-dev

7 years agoCamera metadata: Fix validation alignment check, add more unit tests
Eino-Ville Talvala [Fri, 5 May 2017 18:03:56 +0000 (11:03 -0700)]
Camera metadata: Fix validation alignment check, add more unit tests

- Add unit test to ensure validate_camera_metadata_structure correctly
  reports VALIDATION_SHIFTED for all shifts
- Fix alignment validation bug found by unit test - need to offset
  pointer on both sides of align check.

Test: New unit test passes, no camera CTS regression
Bug: 37980415
Change-Id: I08379bf3792b57c4eae129acc7aa4f22ab960657

7 years agoalsa proxy: fix sampling rate checks in proxy_prepare()
Eric Laurent [Wed, 3 May 2017 18:33:26 +0000 (11:33 -0700)]
alsa proxy: fix sampling rate checks in proxy_prepare()

- proxy_prepare() should not alter the requested properties (format,
sampling rate, channels)  without notifying the caller.
- It should not force the sampling rate to the max sampling rate supported
by the profile but just limit it if the requested combination of
sampling rate, channel count and format is not possible.

Bug: 37949012
Test: verify capture over USB at various sampling rates
Change-Id: Id79ca4fda86db1f756e171d131494c3f244b5f2c

7 years agocamera: Clarify ZSL supports
Chien-Yu Chen [Wed, 3 May 2017 19:17:47 +0000 (12:17 -0700)]
camera: Clarify ZSL supports

For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG
template.

Test: make
Bug: 34689167
Change-Id: I4e3fab6abb93f697589d5ce541529f8d51095d17

7 years agoMerge "camera: Update for enableZsl values in template" into oc-dev
TreeHugger Robot [Mon, 24 Apr 2017 22:36:50 +0000 (22:36 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev

7 years agoCamera: doc cleanup
Yin-Chia Yeh [Wed, 19 Apr 2017 18:02:47 +0000 (11:02 -0700)]
Camera: doc cleanup

Test: compile
Bug: 37095012
Change-Id: Iaad8885420ad031fc743ede81d127d0783803646

7 years agoMerge "Audio route: log fopen xml_patch failure errno" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:42:41 +0000 (01:42 +0000)]
Merge "Audio route: log fopen xml_patch failure errno" into oc-dev

7 years agoMerge "camerametadata: add SHIFTED return value to validate_camera_metadata_structure...
Yin-Chia Yeh [Wed, 19 Apr 2017 00:12:23 +0000 (00:12 +0000)]
Merge "camerametadata: add SHIFTED return value to validate_camera_metadata_structure" into oc-dev

7 years agocamera: Update for enableZsl values in template
Chien-Yu Chen [Tue, 18 Apr 2017 22:17:15 +0000 (15:17 -0700)]
camera: Update for enableZsl values in template

For apps targeting SDK versions O and newer, the value of enableZsl
may be true in still capture template. the value of enableZsl is
always false for other templates.

For apps targeting SDK versions older than O, the value of enableZsl
is always flase.

Test: make
Bug: 34983527
Change-Id: I4819495d5ce74773cc410f0d1aa9bef4bb4bf2be

7 years agoAudio route: log fopen xml_patch failure errno
Kevin Rocard [Tue, 18 Apr 2017 23:06:28 +0000 (16:06 -0700)]
Audio route: log fopen xml_patch failure errno

Vts fail a log because of this open. It is likely a result of previous
leaks (EMFILE) but in order to be sure, log fopen errno value in case of
failure.

Test: play music
Bug: 36311550

Change-Id: I834b346d5387b142d7bd0bd9c1c6d9b9e2a85339
Signed-off-by: Kevin Rocard <krocard@google.com>
7 years agocamerametadata: add SHIFTED return value to validate_camera_metadata_structure
Yin-Chia Yeh [Tue, 18 Apr 2017 02:10:56 +0000 (19:10 -0700)]
camerametadata: add SHIFTED return value to validate_camera_metadata_structure

This allows client to check for camera metadata buffer passed
by some transports that might not preserve alignment property.

Test: compile, GCA working
Bug: 37095012
Change-Id: I2caefe73d86723bc0bc31bb81ff6f692166000c5

7 years agoMerge "Add option to flush the entire buffer on -EOVERFLOW" into oc-dev
Glenn Kasten [Tue, 18 Apr 2017 17:41:36 +0000 (17:41 +0000)]
Merge "Add option to flush the entire buffer on -EOVERFLOW" into oc-dev

7 years agoMerge "libradio_metadata: work with BOARD_VNDK_VERSION" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 15:40:34 +0000 (15:40 +0000)]
Merge "libradio_metadata: work with BOARD_VNDK_VERSION" into oc-dev

7 years agoMerge "libaudio_system_headers: include libcutils_headers" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 03:15:01 +0000 (03:15 +0000)]
Merge "libaudio_system_headers: include libcutils_headers" into oc-dev

7 years agolibradio_metadata: work with BOARD_VNDK_VERSION
Steven Moreland [Tue, 18 Apr 2017 02:37:28 +0000 (19:37 -0700)]
libradio_metadata: work with BOARD_VNDK_VERSION

Test: works with BOARD_VNDK_VERSION
Bug: 37342627
Change-Id: I734f94348ce5818ee6720f2ad4f3ad3ad6e74633

7 years agoMerge "libradio_metadata: vendor_available" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 01:52:54 +0000 (01:52 +0000)]
Merge "libradio_metadata: vendor_available" into oc-dev

7 years agolibaudio_system_headers: include libcutils_headers
Steven Moreland [Tue, 18 Apr 2017 01:25:21 +0000 (18:25 -0700)]
libaudio_system_headers: include libcutils_headers

This is required since system/audio.h (and one more) uses
utils/BitOps.h.

Test: works with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: I13ef898a702316ccbf8b41ec500b5fd60dce155b

7 years agoAdd option to flush the entire buffer on -EOVERFLOW
Glenn Kasten [Mon, 17 Apr 2017 23:34:38 +0000 (16:34 -0700)]
Add option to flush the entire buffer on -EOVERFLOW

This was the previous behavior prior to commit
fc3d70736e4c24cbdc8c91076013c01e487fd4d5.
The new behavior introduced by that commit is to preserve as much of the
buffer as possible.  But that introduced a regression in applications with
so many overflows that they can't recover.  So now the flush is optional.

Test: at bug
Bug: 36725187
Change-Id: Ia728a754405c89b5c46fea598f987ddb9e1e26d8

7 years agolibradio_metadata: vendor_available
Steven Moreland [Mon, 17 Apr 2017 23:42:15 +0000 (16:42 -0700)]
libradio_metadata: vendor_available

By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 37343404
Test: m -j libradio_metadata
Test: attempt to compile with BOARD_VNDK_VERSION := current
Change-Id: Ia80038019847b24118850adce2e4180065082e9b

7 years agoCamera: add static assertion for camera_metadata
Yin-Chia Yeh [Sat, 15 Apr 2017 01:11:45 +0000 (18:11 -0700)]
Camera: add static assertion for camera_metadata

Make sure no one updates these structs in the future.
Treble will allow framework and HAL targeting different
copy of libcamera_metadata, so make sure we don't update
these structs and cause mismatch.

Test: compile (as this is static check)
Bug: 37287148
Change-Id: Ibfc6d710e97e276a9d7eea1ceee1736f75f9a056

7 years agoAdd libaudio_system_headers
Steven Moreland [Fri, 14 Apr 2017 02:06:39 +0000 (19:06 -0700)]
Add libaudio_system_headers

Test: modules using this compiled with BOARD_VNDK_VERSION := current
find dependencies
Bug: 33241851
Change-Id: If2d7ef0ca806b721c65e75774a754a8ee1dbb5fd

7 years agoMerge "Mark as vendor_available" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 03:02:55 +0000 (03:02 +0000)]
Merge "Mark as vendor_available" into oc-dev

7 years agoMark as vendor_available
Steven Moreland [Wed, 12 Apr 2017 04:04:34 +0000 (21:04 -0700)]
Mark as vendor_available

By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 36079834
Test: m -j libcamera_metadata
Test: attempt to compile with BOARD_VNDK_VERSION := current
Change-Id: Ic267fbff784ddb8090266f82d505bcfac52fd1e1

7 years agocamera_metadata: Support append from destination without vendor id
Emilian Peev [Tue, 11 Apr 2017 10:41:28 +0000 (11:41 +0100)]
camera_metadata: Support append from destination without vendor id

Appending to a source with valid vendor id from a metadata without
vendor id should be supported.

Bug: 37198452
Test: CameraProviderManagerTest.MultipleVendorTagTest
Change-Id: I00e96c2d3c284a3db4fef40a910f997f61143347

7 years agocamera_metadata: Support metadata vendor caches
Emilian Peev [Tue, 21 Mar 2017 18:14:19 +0000 (18:14 +0000)]
camera_metadata: Support metadata vendor caches

Metadata buffers will be able to include specific vendor
tag ids. A global vendor cache will then map the id to
the respective vendor tag descriptor.

Bug: 34275821
Test: adb shell /data/nativetest/cameraservice_test/cameraservice_test
--gtest_filter=CameraProviderManagerTest.MultipleVendorTagTest
Complete Camera/Camera2 CTS tests
Change-Id: I68667daa0d3605dfb466e4c0141ceb939893f0bc

7 years agoFix endian define
Andy Hung [Fri, 31 Mar 2017 21:08:14 +0000 (14:08 -0700)]
Fix endian define

Test: compilation
Bug: 36815380
Change-Id: I7d55837dd6ace28745a54971dcbade1c4b8a8139

7 years agoAdd tests for ErrorLog SimpleLog PowerLog
Andy Hung [Thu, 23 Mar 2017 23:17:35 +0000 (16:17 -0700)]
Add tests for ErrorLog SimpleLog PowerLog

Test: this is it
Bug: 30572472
Change-Id: Id8efddca8e0378127748eaef1f1b876462650e8b

7 years agoAdd time string object
Andy Hung [Thu, 23 Mar 2017 23:13:53 +0000 (16:13 -0700)]
Add time string object

Test: unit test and audioflinger dumpsys
Bug: 30572472
Change-Id: Ieac2ca4bfd2e32174df3ac362f621cba4ae8cb8f
(cherry picked from commit c1eb186fc1ab8837e95e01be8a87a77e952fc81f)

7 years agoPowerLog: Add dump prefix to powerlog
Andy Hung [Thu, 23 Mar 2017 23:09:11 +0000 (16:09 -0700)]
PowerLog: Add dump prefix to powerlog

Test: unit test and dumpsys media.audio_flinger
Bug: 30572472
Change-Id: I7d53b399cbaa22195b386422efe789250624bb3a
(cherry picked from commit 70f10246d5436875a22650a53bf33b3241157a31)

7 years agoMove error logging to audio utils
Andy Hung [Wed, 15 Mar 2017 21:52:09 +0000 (14:52 -0700)]
Move error logging to audio utils

Test: dumpsys media.audio_flinger, unit test
Bug: 30572472
Change-Id: I48b7d4b94762a45fb211b8a7a12cf653c8f48a5d

7 years agoAdd SimpleLog to audio_utils
Andy Hung [Tue, 21 Mar 2017 18:17:32 +0000 (11:17 -0700)]
Add SimpleLog to audio_utils

SimpleLog provides a private logcat-style logging
to avoid cluttering the device logcat.

Test: dumpsys media.audio_flinger and unit test
Bug: 30572472
Change-Id: I22aafc9f7177c9e0447e0d7d9385c50442c8b78a

7 years agoMerge changes from topic 'power log 2'
Andy Hung [Fri, 24 Mar 2017 16:17:51 +0000 (16:17 +0000)]
Merge changes from topic 'power log 2'

* changes:
  Fix clock.h for Mac OS X build
  Revert "Revert "Add power logging""

7 years agoFix clock.h for Mac OS X build
Andy Hung [Mon, 20 Mar 2017 18:51:08 +0000 (11:51 -0700)]
Fix clock.h for Mac OS X build

Test: manual check of non-linux option and on Mac OS X.
Bug: 30572472
Change-Id: Idfd33fcebb1fb694308a4d513a4a2ae0b17aa24d

7 years agoMerge "update auto generated audio-base.h file"
Eric Laurent [Tue, 21 Mar 2017 23:41:08 +0000 (23:41 +0000)]
Merge "update auto generated audio-base.h file"

7 years agoRevert "Revert "Add power logging""
Andy Hung [Mon, 20 Mar 2017 16:24:53 +0000 (09:24 -0700)]
Revert "Revert "Add power logging""

This reverts commit b674db8360be8109a838351f4527f6b9f420e04a.

Test: dumpsys, offloaded, non-offloaded playback
Bug: 30572472
Change-Id: I634ce5ffd226b55fa71999b503cb003e77127d52

7 years agoMerge "Revert "Add power logging""
Jin Qian [Sat, 18 Mar 2017 02:47:19 +0000 (02:47 +0000)]
Merge "Revert "Add power logging""

7 years agoRevert "Add power logging"
Jin Qian [Sat, 18 Mar 2017 02:43:21 +0000 (02:43 +0000)]
Revert "Add power logging"

This reverts commit 13082f80dcee5f119cdb68a4dbc972cd2b939668.

Change-Id: I6bd03874fd219ef5b82e23d6e0dc97decbb87198

7 years agoMerge "Add power logging"
Andy Hung [Sat, 18 Mar 2017 01:21:54 +0000 (01:21 +0000)]
Merge "Add power logging"

7 years agoupdate auto generated audio-base.h file
Eric Laurent [Sat, 18 Mar 2017 00:37:58 +0000 (17:37 -0700)]
update auto generated audio-base.h file

Test: audio playback and capture regression tests.
Change-Id: I215091b5dd30295f05c48760f3143c2b9793544b

7 years agoAdd power logging
Andy Hung [Sat, 11 Mar 2017 01:07:23 +0000 (17:07 -0800)]
Add power logging

PowerLog captures the audio data power (measured in dBFS) over time.

Test: power_tests
Bug: 30572472
Change-Id: If8977f9b8f9d2d15ea07bc32bed7f802513a742b

7 years agoMerge "audio: increase max limit of Audio Port elements"
Mikhail Naganov [Fri, 17 Mar 2017 15:32:36 +0000 (15:32 +0000)]
Merge "audio: increase max limit of Audio Port elements"

7 years agoMerge "audiohal: Rename output flag VOIP_CALL_RX -> VOIP_RX"
Mikhail Naganov [Thu, 16 Mar 2017 23:57:13 +0000 (23:57 +0000)]
Merge "audiohal: Rename output flag VOIP_CALL_RX -> VOIP_RX"

7 years agoaudio: increase max limit of Audio Port elements
Mikhail Naganov [Thu, 16 Mar 2017 20:43:17 +0000 (13:43 -0700)]
audio: increase max limit of Audio Port elements

- Increase max limit of audio port sample rate, channel mask and
  formats from 16 to 32

Change-Id: I2babd55bb09c2b500a2643fda28068064ddde73d
Test: make

7 years agoMerge "Implement scanning for maximal/compatible device attributes."
Paul Mclean [Wed, 15 Mar 2017 20:44:38 +0000 (20:44 +0000)]
Merge "Implement scanning for maximal/compatible device attributes."

7 years agoImplement scanning for maximal/compatible device attributes.
Paul McLean [Wed, 8 Mar 2017 22:06:27 +0000 (15:06 -0700)]
Implement scanning for maximal/compatible device attributes.

Bug: 28824369

Change-Id: I3fb78f819193e19afcf890105a3ce08b70fb1a41
Test: Manual

7 years agoaudiohal: Rename output flag VOIP_CALL_RX -> VOIP_RX
Mikhail Naganov [Tue, 14 Mar 2017 16:18:19 +0000 (09:18 -0700)]
audiohal: Rename output flag VOIP_CALL_RX -> VOIP_RX

Makes the constant name consistent with non-Pixel HALs

Change-Id: I1840165d2aa5f3e43d35f4618ab9a125bd98d1a1
Test: make

7 years agoRename audio_utils/conversion.h to mono_blend.h
Glenn Kasten [Fri, 24 Feb 2017 00:55:16 +0000 (16:55 -0800)]
Rename audio_utils/conversion.h to mono_blend.h

There is only one function declared in that header file, and it is
mono_blend, so a more specific filename may be easier to understand.

Test: compiles OK
Change-Id: Ie2aec6c706b1822581b34d3702818b8200a1db8a

7 years agofifo: handle overrun correctly
Glenn Kasten [Mon, 6 Mar 2017 22:58:33 +0000 (14:58 -0800)]
fifo: handle overrun correctly

On overrun, allow a non-throttling reader to read any frames not yet overwritten.

Also provide an exact count of lost frames rather than an estimate,
when the fifo is configured with a non-power-of-2 capacity.

Bug: 36003483
Test: media.log and fifo interactive unit test
Change-Id: Ia0a7b6f1043f1cd34f6b4fa779785afeff34c5c9

7 years agoMerge "fifo: Update documentation for non-NULL buffer pointers"
Glenn Kasten [Tue, 7 Mar 2017 20:22:15 +0000 (20:22 +0000)]
Merge "fifo: Update documentation for non-NULL buffer pointers"

7 years agofifo: Update documentation for non-NULL buffer pointers
Glenn Kasten [Mon, 5 Dec 2016 20:05:00 +0000 (12:05 -0800)]
fifo: Update documentation for non-NULL buffer pointers

Test: comments only, should not require re-test
Bug: 36003458
Change-Id: I92610263c4d46e161c205096422e1cb3eb3a4243

7 years agoMerge "audio: add missing flags and devices"
Eric Laurent [Tue, 7 Mar 2017 01:22:40 +0000 (01:22 +0000)]
Merge "audio: add missing flags and devices"

7 years agoMerge "Convert libbinderwrapper_test_support to static library." am: f4de44321e am...
Alex Deymo [Sat, 4 Mar 2017 07:14:23 +0000 (07:14 +0000)]
Merge "Convert libbinderwrapper_test_support to static library." am: f4de44321e am: 9bf9240362
am: db8322cb30

Change-Id: I3d6fb4058a780428dbd5e23c0cdad3880af65e1d

7 years agoMerge "Convert libbinderwrapper_test_support to static library." am: f4de44321e
Alex Deymo [Sat, 4 Mar 2017 07:11:22 +0000 (07:11 +0000)]
Merge "Convert libbinderwrapper_test_support to static library." am: f4de44321e
am: 9bf9240362

Change-Id: Iac13483ef696c22f6edfecd0c61341ba45a2d98a

7 years agoMerge "Convert libbinderwrapper_test_support to static library."
Alex Deymo [Sat, 4 Mar 2017 07:08:51 +0000 (07:08 +0000)]
Merge "Convert libbinderwrapper_test_support to static library."
am: f4de44321e

Change-Id: I22589184436e0687a749b300a44192ce4ca1918e

7 years agoMerge "Convert libbinderwrapper_test_support to static library."
Treehugger Robot [Sat, 4 Mar 2017 07:03:34 +0000 (07:03 +0000)]
Merge "Convert libbinderwrapper_test_support to static library."

7 years agoConvert libbinderwrapper_test_support to static library.
Alex Deymo [Sat, 4 Mar 2017 00:15:21 +0000 (16:15 -0800)]
Convert libbinderwrapper_test_support to static library.

Bug: 35804180
Test: `make checkbuild`
Change-Id: I334a0ad608ea6a7742529cd0f369530abe7ab02e

7 years agoaudio: add missing flags and devices
Eric Laurent [Sat, 4 Mar 2017 00:37:12 +0000 (16:37 -0800)]
audio: add missing flags and devices

Add missing devices for USB headset to allow distinction between USB
sound cards and simple USB headsets
Add output and input flags indicating special output and input profiles
to used for VoIP streams.

Test: make.
Change-Id: I54c5b08fcf2e1d9342e8a11244ac3e00d052bb89

7 years agoUpdate audio*-base.h
Steven Moreland [Fri, 24 Feb 2017 21:16:05 +0000 (13:16 -0800)]
Update audio*-base.h

Test: pass
Bug: 33541458
Change-Id: I0a779ab41cbf471d3e13b4492c99f7d9d2bd65fa

7 years agoaudio_route: Fix cleanup of 'audio_route' structure
Mikhail Naganov [Thu, 23 Feb 2017 21:12:36 +0000 (13:12 -0800)]
audio_route: Fix cleanup of 'audio_route' structure

'path_free' function was not updating 'num_mixer_paths' after
freeing 'mixer_path' array, which was leading to a crash during
a subsequent call to 'path_get_by_name'.

Bug: 35445650
Change-Id: Ie47bb2e548fde89d9519ac726618fcf2e72da286
Test: with BT A2DP connected, kill system_server, watch logcat

7 years agoMerge "Audio HAL: extensions for new SoC features"
Mikhail Naganov [Tue, 31 Jan 2017 19:38:07 +0000 (19:38 +0000)]
Merge "Audio HAL: extensions for new SoC features"

7 years agoMerge "Implement radio_metadata wrapper for safer memory management." am: fe81805384...
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:49:47 +0000 (20:49 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management." am: fe81805384 am: cf9d8d70c5 am: 468470f755
am: aaa26d246d

Change-Id: Ifc0cd6329f71b99b2f20e5ca11584ffa946de4b7

7 years agoMerge "Implement radio_metadata wrapper for safer memory management." am: fe81805384...
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:42:19 +0000 (20:42 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management." am: fe81805384 am: cf9d8d70c5
am: 468470f755

Change-Id: I4a38099e8b1c5a18714ab3d28f5a9b8793c87e51

7 years agoMerge "Implement radio_metadata wrapper for safer memory management." am: fe81805384
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:38:58 +0000 (20:38 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management." am: fe81805384
am: cf9d8d70c5

Change-Id: Ibada73a9f840ddb7f82e96f9891b184b3c89d017

7 years agoMerge "Implement radio_metadata wrapper for safer memory management."
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:32:57 +0000 (20:32 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management."
am: fe81805384

Change-Id: I33baba501b70de5939f623b8ca69c5cc46ac96e4

7 years agoMerge "Implement radio_metadata wrapper for safer memory management."
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:26:06 +0000 (20:26 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management."

7 years agoAudio HAL: extensions for new SoC features
Mikhail Naganov [Mon, 23 Jan 2017 18:45:19 +0000 (10:45 -0800)]
Audio HAL: extensions for new SoC features

Extend audio channel mask.

Added AC4 format.

Change-Id: I413ff4099601e6d8449593cc88ee55dda1d9d8e9
Test: make

7 years agoImplement radio_metadata wrapper for safer memory management.
Tomasz Wasilczyk [Mon, 23 Jan 2017 22:33:50 +0000 (14:33 -0800)]
Implement radio_metadata wrapper for safer memory management.

Bug: b/34054813
Test: VTS, manual - both done in internal branch
Change-Id: If9c27669bb0d75ca67b75a761afe4cdc9dc51f0b

7 years agoMerge "camera: Add enableZsl key"
TreeHugger Robot [Thu, 26 Jan 2017 01:23:22 +0000 (01:23 +0000)]
Merge "camera: Add enableZsl key"

7 years agoMerge "Add AUDIO_FLAG_DEEP_BUFFER and AUDIO_FLAG_NONE for AudioAttributes"
TreeHugger Robot [Thu, 26 Jan 2017 00:22:49 +0000 (00:22 +0000)]
Merge "Add AUDIO_FLAG_DEEP_BUFFER and AUDIO_FLAG_NONE for AudioAttributes"

7 years agocamera: Add enableZsl key
Chien-Yu Chen [Mon, 9 Jan 2017 23:55:06 +0000 (15:55 -0800)]
camera: Add enableZsl key

Add enableZsl key so the apps can choose to allow or disallow out of
order frame contents and metadata like timestamp.

Test: Updated camera CTS tests pass
Bug: 30983997
Change-Id: I7d0fd82e551bb50420c438472e5240f3fee65d73

7 years agoaudio: add missing definition for stub HAL module name
Eric Laurent [Thu, 19 Jan 2017 01:07:08 +0000 (17:07 -0800)]
audio: add missing definition for stub HAL module name

Bug: 34360879
Test: make and check stub HAL is loaded in HIDL passthrough mode

Change-Id: Ibb90a7f77baf910b6c68c1a5adf1c39c8a8d9906

7 years agoAdd AUDIO_FLAG_DEEP_BUFFER and AUDIO_FLAG_NONE for AudioAttributes
Andy Hung [Fri, 13 Jan 2017 03:14:19 +0000 (19:14 -0800)]
Add AUDIO_FLAG_DEEP_BUFFER and AUDIO_FLAG_NONE for AudioAttributes

Test: AudioTrack CTS test, Play Movies
Bug: 30687201
Change-Id: Iba30763a7ad930675453a9acb855c080c4da8c6a

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b am: b239ca4c9...
Mark Salyzyn [Wed, 11 Jan 2017 18:59:20 +0000 (18:59 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b am: b239ca4c99 am: f70588249e
am: c464b07573

Change-Id: I003bd76cf3dd0662c59b9e59b59fae3eb919d950

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b am: b239ca4c99
Mark Salyzyn [Wed, 11 Jan 2017 18:53:20 +0000 (18:53 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b am: b239ca4c99
am: f70588249e

Change-Id: If008012618637a2a53a64c1ee580318bee6b63d6

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b
Mark Salyzyn [Wed, 11 Jan 2017 18:48:19 +0000 (18:48 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b
am: b239ca4c99

Change-Id: I72bacdf8bca3f057ef26721520042907e62d8d4c

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros"
Mark Salyzyn [Wed, 11 Jan 2017 18:42:18 +0000 (18:42 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"
am: 1fb716a12b

Change-Id: I2281b2971bc4557f566da755884e7c7465e4c9bb

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros"
Treehugger Robot [Wed, 11 Jan 2017 18:36:13 +0000 (18:36 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"

7 years agoliblog: use log/log.h when utilizing ALOG macros
Mark Salyzyn [Tue, 10 Jan 2017 22:29:16 +0000 (14:29 -0800)]
liblog: use log/log.h when utilizing ALOG macros

Test: compile
Bug: 30465923
Change-Id: I4329b7dc918b732b07662a27c52e3b431ffabd3d

7 years agoDefine AUDIO_USAGE_ASSISTANT in list of audio attributes usage
Jean-Michel Trivi [Thu, 29 Dec 2016 20:22:06 +0000 (12:22 -0800)]
Define AUDIO_USAGE_ASSISTANT in list of audio attributes usage

This change was autogenerated from an update in
  hardware/interfaces/audio/common/2.0/types.hal
with script
  hardware/interfaces/update-base-files.sh

Test: make
Bug: 30947943
Change-Id: I703b30e9a55299a0db84613361af537aa7d7c599

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23...
Mark Salyzyn [Tue, 27 Dec 2016 22:07:26 +0000 (22:07 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23 am: 6f84b4a716 am: bbe900ad12
am: 5af7309214

Change-Id: I0c2a7a0727acf4a97506ee801c4f081145a88ff1

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23...
Mark Salyzyn [Tue, 27 Dec 2016 22:00:26 +0000 (22:00 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23 am: 6f84b4a716
am: bbe900ad12

Change-Id: I4ee9513b768984ab477c3585bd5e78032208c092

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23
Mark Salyzyn [Tue, 27 Dec 2016 21:52:55 +0000 (21:52 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23
am: 6f84b4a716

Change-Id: I3b93f676e39094a3ca5e2161e968185662f6dcf2

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h"
Mark Salyzyn [Tue, 27 Dec 2016 21:45:24 +0000 (21:45 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h"
am: c8a6e3ea23

Change-Id: Iddd2d6d623ba7e6b605937def3bc9b0ac36b4d38

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h"
Treehugger Robot [Tue, 27 Dec 2016 21:34:30 +0000 (21:34 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h"

7 years agomedia: Replace cutils/log.h with android/log.h or log/log.h
Mark Salyzyn [Wed, 28 Sep 2016 22:40:31 +0000 (15:40 -0700)]
media: Replace cutils/log.h with android/log.h or log/log.h

- replace cutils/log.h with android/log.h (main buffer logging)
- replace cutils/log.h with log.log.h (+SafetyNet logging)

Test: compile
Bug: 26552300
Bug: 32189077
Change-Id: Icda4d5ab7555c0b801fd362fdcfa65b1500612b4

7 years agoMerge "Add system/media/Android.bp" am: 0eb9eac06d am: 138805b4e5 am: f6e848ea0e
Dan Willemsen [Tue, 20 Dec 2016 21:10:51 +0000 (21:10 +0000)]
Merge "Add system/media/Android.bp" am: 0eb9eac06d am: 138805b4e5 am: f6e848ea0e
am: 5fe9d20ae7

Change-Id: Ie6830955695d2931cdd83ea2f6b18c608aab79e3

7 years agoMerge "Add system/media/Android.bp" am: 0eb9eac06d am: 138805b4e5
Dan Willemsen [Tue, 20 Dec 2016 21:00:50 +0000 (21:00 +0000)]
Merge "Add system/media/Android.bp" am: 0eb9eac06d am: 138805b4e5
am: f6e848ea0e

Change-Id: I5472ee8eb49501a18e895643944ccb51b93373bc

7 years agoMerge "Add system/media/Android.bp" am: 0eb9eac06d
Dan Willemsen [Tue, 20 Dec 2016 20:42:11 +0000 (20:42 +0000)]
Merge "Add system/media/Android.bp" am: 0eb9eac06d
am: 138805b4e5

Change-Id: Ib17b17aee989e69cc9c8d212704c94f84b6e4393

7 years agoMerge "Add system/media/Android.bp"
Dan Willemsen [Tue, 20 Dec 2016 20:33:27 +0000 (20:33 +0000)]
Merge "Add system/media/Android.bp"
am: 0eb9eac06d

Change-Id: Ic355591646ebc2815107f871dc9e26680cca7704

7 years agoMerge "Add system/media/Android.bp"
Treehugger Robot [Tue, 20 Dec 2016 20:25:08 +0000 (20:25 +0000)]
Merge "Add system/media/Android.bp"

7 years agoAdd system/media/Android.bp
Dan Willemsen [Tue, 20 Dec 2016 18:52:30 +0000 (10:52 -0800)]
Add system/media/Android.bp

Test: Soong's build.ninja identical before/after (except GlobRules)
Change-Id: Ib294d1afcfcc311748f436232d27ed381dc99fb6

7 years agofifo: non-throttling reader doesn't see data already written
Glenn Kasten [Fri, 16 Dec 2016 20:42:26 +0000 (12:42 -0800)]
fifo: non-throttling reader doesn't see data already written

Test: see the multi-reader interactive test
Change-Id: I0663a8e90efc094fef09401c6e2ecd3391100efa

7 years agoaudio: add definitions for MMAP stream mode
Eric Laurent [Fri, 9 Dec 2016 22:32:30 +0000 (14:32 -0800)]
audio: add definitions for MMAP stream mode

Bug: 33398120
Test: make marlin-eng

Change-Id: I7892f1e0920df05aa4f8dbf459a02a8b6e27958d

7 years agoMerge "fifo: add index references with caching and deferred operations"
Glenn Kasten [Wed, 14 Dec 2016 16:37:05 +0000 (16:37 +0000)]
Merge "fifo: add index references with caching and deferred operations"

7 years agofifo: add index references with caching and deferred operations
Glenn Kasten [Wed, 30 Nov 2016 19:05:32 +0000 (11:05 -0800)]
fifo: add index references with caching and deferred operations

The new classes will eventually permit a set of related atomic operations,
wakes, and waits to be grouped together into a single sequence point,
and will allow use of event flags to wait for the "or" of multiple FIFOs.

This is one of a series of CLs to isolate the dependencies.

Test: not ready yet for testing
Change-Id: I2055b7a35721222cd914973cd210f5c0dca7d4ef

7 years agoMerge "Ran hardware/interfaces/update-base-files.sh."
TreeHugger Robot [Tue, 13 Dec 2016 19:31:02 +0000 (19:31 +0000)]
Merge "Ran hardware/interfaces/update-base-files.sh."

7 years agoMerge "Unique ID for audio players"
Jean-Michel Trivi [Tue, 13 Dec 2016 16:19:06 +0000 (16:19 +0000)]
Merge "Unique ID for audio players"

7 years agoRan hardware/interfaces/update-base-files.sh.
Steven Moreland [Mon, 12 Dec 2016 17:51:39 +0000 (09:51 -0800)]
Ran hardware/interfaces/update-base-files.sh.

Test: pass
Change-Id: Iafd710d21c3bd7d843894d945fc86b055a04dda6

7 years agoMerge "Audio HAL: extensions for new SoC features"
Mikhail Naganov [Wed, 7 Dec 2016 23:40:13 +0000 (23:40 +0000)]
Merge "Audio HAL: extensions for new SoC features"