OSDN Git Service

android-x86/system-media.git
8 years agoMerge "brillo: Add client library for brilloaudioservice." am: 1247f05
Ralph Nathan [Fri, 8 Apr 2016 21:21:33 +0000 (21:21 +0000)]
Merge "brillo: Add client library for brilloaudioservice." am: 1247f05
am: 075589d

* commit '075589d8d17d9b407e6dfef2dea5397dc5452b3a':
  brillo: Add client library for brilloaudioservice.

Change-Id: I04e7ce7fe44e72792b0e8953fd7c1f79e9d2bada

8 years agoMerge "brillo: Add client library for brilloaudioservice."
Ralph Nathan [Fri, 8 Apr 2016 21:12:44 +0000 (21:12 +0000)]
Merge "brillo: Add client library for brilloaudioservice."
am: 1247f05

* commit '1247f05ba6f45cd6d9045c55745801e6c260c7d4':
  brillo: Add client library for brilloaudioservice.

Change-Id: I1e8d1a36cb00389d5cf35a1767ec24f8551746f8

8 years agoMerge "brillo: Add client library for brilloaudioservice."
Ralph Nathan [Fri, 8 Apr 2016 20:54:25 +0000 (20:54 +0000)]
Merge "brillo: Add client library for brilloaudioservice."

8 years agoMerge "SPDIF: Fix warnings from static analyser" am: 19e3fee
Chih-hung Hsieh [Fri, 8 Apr 2016 18:16:34 +0000 (18:16 +0000)]
Merge "SPDIF: Fix warnings from static analyser" am: 19e3fee
am: 36be1d4

* commit '36be1d471297b58b6b5d81ae71429e3170720f69':
  SPDIF: Fix warnings from static analyser

Change-Id: I35cacb44c5a8c4ae48c4353aedd89835458875cf

8 years agoMerge "SPDIF: Fix warnings from static analyser"
Phil Burk [Fri, 8 Apr 2016 18:07:25 +0000 (18:07 +0000)]
Merge "SPDIF: Fix warnings from static analyser"
am: 19e3fee

* commit '19e3fee37465d93cd545849355383ae9fb749f7f':
  SPDIF: Fix warnings from static analyser

Change-Id: I47d0aedd7efdde88646ca4856cda32dfedd016d7

8 years agoMerge "SPDIF: Fix warnings from static analyser"
Chih-hung Hsieh [Fri, 8 Apr 2016 17:46:26 +0000 (17:46 +0000)]
Merge "SPDIF: Fix warnings from static analyser"

8 years agoMerge changes from topics \'cam-ndk-hidden-enum\', \'cam-ndk-enum-dco\', \'cam-ndk...
Yin-Chia Yeh [Thu, 7 Apr 2016 22:46:05 +0000 (22:46 +0000)]
Merge changes from topics \'cam-ndk-hidden-enum\', \'cam-ndk-enum-dco\', \'cam-ndk-hidden-keys\' into nyc-dev
am: b1379bd

* commit 'b1379bdb8fe4ddf1e052bff5e76703f70ec4afab':
  Camera: hide some enum values in NDK
  Camera: codegen NDK metadata enum value documents
  Camera: modify metadata visibility attributes

Change-Id: Ife5a241f013a3f4bac5b41fc2b358005c8cb6a7b

8 years agoMerge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden...
Yin-Chia Yeh [Thu, 7 Apr 2016 22:33:36 +0000 (22:33 +0000)]
Merge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden-keys' into nyc-dev

* changes:
  Camera: hide some enum values in NDK
  Camera: codegen NDK metadata enum value documents
  Camera: modify metadata visibility attributes

8 years agoCamera: hide some enum values in NDK
Yin-Chia Yeh [Wed, 6 Apr 2016 18:58:41 +0000 (11:58 -0700)]
Camera: hide some enum values in NDK

Bug: 27102995
Change-Id: Ibcca0576f5e88c2e7a904c0d0699640c69005048

8 years agoCamera: codegen NDK metadata enum value documents
Yin-Chia Yeh [Mon, 4 Apr 2016 22:31:29 +0000 (15:31 -0700)]
Camera: codegen NDK metadata enum value documents

Bug: 27102995
Change-Id: I5fc2bbde479d28bae53b7459b5c78cfe8cf6fa80

8 years agoCamera: modify metadata visibility attributes
Yin-Chia Yeh [Sat, 2 Apr 2016 23:30:30 +0000 (16:30 -0700)]
Camera: modify metadata visibility attributes

So we can better describe whether a key should present in java or
native API.

Here are all possbile visibility values:
public      = visible in both Java/NDK public API
ndk_public  = visible in NDK API, @hide in java API
             (mostly source of synthethic keys)
java_public = visible in public java API, not present in NDK
             (mostly synthetic keys or features not supported
              in NDK)
hidden      = @hide in java API, not visible in NDK
system      = not defined in any API.

Bug: 27102995
Change-Id: Ib5163b0aba62126dfe3d72ec62a24136ce206b17

8 years agoSPDIF: Fix warnings from static analyser
Phil Burk [Wed, 6 Apr 2016 21:54:46 +0000 (14:54 -0700)]
SPDIF: Fix warnings from static analyser

Bug: 27230467
Change-Id: I89013d8b6696c6491db655ff2e1a3ceee9ffa3c8
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoSPDIF: Fix warnings from static analyser
Phil Burk [Wed, 6 Apr 2016 23:55:33 +0000 (23:55 +0000)]
SPDIF: Fix warnings from static analyser
am: 69250e0

* commit '69250e041a6ba1e32555db89a05e85b4d0f45006':
  SPDIF: Fix warnings from static analyser

Change-Id: I5c6a94afc8fcc146ecb290b8626d5c20790401aa

8 years agoSPDIF: Fix warnings from static analyser
Phil Burk [Wed, 6 Apr 2016 21:54:46 +0000 (14:54 -0700)]
SPDIF: Fix warnings from static analyser

Bug: 27230467
Change-Id: I89013d8b6696c6491db655ff2e1a3ceee9ffa3c8
Signed-off-by: Phil Burk <philburk@google.com>
8 years agobrillo: Add client library for brilloaudioservice.
Ralph Nathan [Tue, 16 Feb 2016 17:48:29 +0000 (09:48 -0800)]
brillo: Add client library for brilloaudioservice.

Add a client library so that developers can talk to the Brillo audio
service. This CL provides support for device enumeration on Brillo.

BUG=26938282
BUG=26938132
TEST=unit tests

Change-Id: Id3f99f8511ea550f5691da623a0d3a796f00f9da

8 years agoMerge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev
Eino-Ville Talvala [Mon, 4 Apr 2016 19:52:46 +0000 (19:52 +0000)]
Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev
am: cfb4b10

* commit 'cfb4b10ad5b3b43d56939371b0a9c13824395ac1':
  Camera: Allow preview operation of SCENE_MODE_HDR

Change-Id: I204b761a14d266773d1db5e55cf58ac05726407b

8 years agoMerge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev
Eino-Ville Talvala [Mon, 4 Apr 2016 19:38:51 +0000 (19:38 +0000)]
Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev

8 years agoCamera: Allow preview operation of SCENE_MODE_HDR
Eino-Ville Talvala [Mon, 4 Apr 2016 17:47:43 +0000 (10:47 -0700)]
Camera: Allow preview operation of SCENE_MODE_HDR

Some devices support HDR output for preview in addition to still
capture, so explicitly allow for that in the documentation of
SCENE_MODE_HDR.

Bug: 27313038
Change-Id: I76f3883b918bd3d81c8c03e0cee5d3dc7986bb25

8 years agoMerge "Camera: move path of camera device info" into nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 01:30:46 +0000 (01:30 +0000)]
Merge "Camera: move path of camera device info" into nyc-dev
am: 01aec95

* commit '01aec953d62546aa37d9d9e2b3473ad580b0fcbd':
  Camera: move path of camera device info

Change-Id: I54f3889301670f94eed85acaa5d6bb5d1ef78e6d

8 years agoMerge "Camera: hide hidden NDK enum values" into nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 01:30:46 +0000 (01:30 +0000)]
Merge "Camera: hide hidden NDK enum values" into nyc-dev
am: 3dcde8e

* commit '3dcde8e4877aac2b69bd1da3dd71e2ef95f7c030':
  Camera: hide hidden NDK enum values

Change-Id: I487900c3233b428427c237eb24dacb1c21cc2b61

8 years agoMerge "Camera: move path of camera device info" into nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 00:53:26 +0000 (00:53 +0000)]
Merge "Camera: move path of camera device info" into nyc-dev

8 years agoMerge "Camera: hide hidden NDK enum values" into nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 00:52:42 +0000 (00:52 +0000)]
Merge "Camera: hide hidden NDK enum values" into nyc-dev

8 years agoCamera: move path of camera device info
Yin-Chia Yeh [Sat, 2 Apr 2016 00:37:47 +0000 (17:37 -0700)]
Camera: move path of camera device info

CameraDeviceInfo.java is now in cts-device-info.

Bug: 27967489
Change-Id: I30451146f127d8388215977bda9f2d05ff1fd555

8 years agoCamera: hide hidden NDK enum values
Yin-Chia Yeh [Thu, 31 Mar 2016 18:04:30 +0000 (11:04 -0700)]
Camera: hide hidden NDK enum values

Bug: 27102995
Change-Id: I840d93ea3d81a7cb387e5d096995a30fa0f8f238

8 years agoresolve merge conflicts of 0af9505 to nyc-dev-plus-aosp
Glenn Kasten [Thu, 31 Mar 2016 16:34:10 +0000 (09:34 -0700)]
resolve merge conflicts of 0af9505 to nyc-dev-plus-aosp

Change-Id: I5701acd035d1918808f6d4a76c033d48d3bffabb

8 years agoMerge "Revert "Revert "Make build warnings be errors""" into nyc-dev
Glenn Kasten [Thu, 31 Mar 2016 16:16:51 +0000 (16:16 +0000)]
Merge "Revert "Revert "Make build warnings be errors""" into nyc-dev

8 years agoMerge "AC3FrameScanner: put bsmod in Pc as per IEC61937" into nyc-dev
Phil Burk [Wed, 30 Mar 2016 22:20:16 +0000 (22:20 +0000)]
Merge "AC3FrameScanner: put bsmod in Pc as per IEC61937" into nyc-dev
am: f10faaf

* commit 'f10faaf73935c5aa03a9b85d0560b572edc5655e':
  AC3FrameScanner: put bsmod in Pc as per IEC61937

Change-Id: Ifa4b1b40ffd92982015e50a514bf20241f6d7ca6

8 years agoMerge "AC3FrameScanner: put bsmod in Pc as per IEC61937" into nyc-dev
Phil Burk [Wed, 30 Mar 2016 22:11:29 +0000 (22:11 +0000)]
Merge "AC3FrameScanner: put bsmod in Pc as per IEC61937" into nyc-dev

8 years agoMerge "Fix build warnings" into nyc-dev
Glenn Kasten [Wed, 30 Mar 2016 15:12:27 +0000 (15:12 +0000)]
Merge "Fix build warnings" into nyc-dev
am: b8cd82f

* commit 'b8cd82f79841ee93c2acb952c2bcc184468040ee':
  Fix build warnings

Change-Id: Ia8eb90bf27737681ae8c82dda77d27c16f7307d9

8 years agoMerge "Fix build warnings" into nyc-dev
Glenn Kasten [Wed, 30 Mar 2016 15:09:10 +0000 (15:09 +0000)]
Merge "Fix build warnings" into nyc-dev

8 years agoFix build warnings
Glenn Kasten [Tue, 29 Mar 2016 23:21:27 +0000 (16:21 -0700)]
Fix build warnings

Change-Id: I13d8d8feab1084a85234da8597cd37102a76a23c

8 years agoRevert "Revert "Make build warnings be errors""
Glenn Kasten [Tue, 29 Mar 2016 22:26:54 +0000 (22:26 +0000)]
Revert "Revert "Make build warnings be errors""

This reverts commit ce89418df1e8c1e8e25067d5a2eb8e1b260e28d9.

Change-Id: I0a372cfdfa03344dfff50bce9eb32227238e9c94

8 years agoMerge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev
Glenn Kasten [Tue, 29 Mar 2016 22:15:26 +0000 (22:15 +0000)]
Merge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev
am: 490902b

* commit '490902b995c86c218579cdc88faf69e80d75fee7':
  Use audio_module_handle_t and audio_patch_handle_t consistently

Change-Id: Ibaa8f61644cee6ec0dc9b95c766ddaab5da43649

8 years agoMerge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev
Glenn Kasten [Tue, 29 Mar 2016 22:02:44 +0000 (22:02 +0000)]
Merge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev

8 years agoresolve merge conflicts of 2e38388 to nyc-dev-plus-aosp
Glenn Kasten [Mon, 28 Mar 2016 23:43:59 +0000 (16:43 -0700)]
resolve merge conflicts of 2e38388 to nyc-dev-plus-aosp

Change-Id: I2afe946bf11c74f13ff6153def15a6db814acb47

8 years agoMerge "Revert "Make build warnings be errors"" into nyc-dev
Glenn Kasten [Mon, 28 Mar 2016 22:52:09 +0000 (22:52 +0000)]
Merge "Revert "Make build warnings be errors"" into nyc-dev

8 years agoRevert "Make build warnings be errors"
Glenn Kasten [Mon, 28 Mar 2016 22:51:42 +0000 (22:51 +0000)]
Revert "Make build warnings be errors"

This reverts commit 2a34a2fc06a96ca23baa2f81a1490d6407a37637.

Change-Id: Ia7be57b1ca60e14f40f0104b8b71c84ed6465440

8 years agoresolve merge conflicts of a7cad44 to nyc-dev-plus-aosp
Glenn Kasten [Mon, 28 Mar 2016 22:18:30 +0000 (15:18 -0700)]
resolve merge conflicts of a7cad44 to nyc-dev-plus-aosp

Change-Id: I7a2be81755faf45d1aee4d51ced279e16eb2f11a

8 years agoFix build warnings
Glenn Kasten [Mon, 28 Mar 2016 22:10:19 +0000 (22:10 +0000)]
Fix build warnings
am: 45db169

* commit '45db1699c3b9d1f32d5ddf44fc32b0956cc47863':
  Fix build warnings

8 years agoAC3FrameScanner: put bsmod in Pc as per IEC61937
Phil Burk [Mon, 28 Mar 2016 22:02:17 +0000 (15:02 -0700)]
AC3FrameScanner: put bsmod in Pc as per IEC61937

Needed for HDMI pass-through.
This detail was missing from earlier streams.

Bug: 22037731
Change-Id: I2df47c4dea779e20104b937164d4b312a1694059
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoMerge "Make build warnings be errors" into nyc-dev
Glenn Kasten [Mon, 28 Mar 2016 21:45:39 +0000 (21:45 +0000)]
Merge "Make build warnings be errors" into nyc-dev

8 years agoFix build warnings
Glenn Kasten [Thu, 24 Mar 2016 18:43:42 +0000 (11:43 -0700)]
Fix build warnings

Also fix a memory leak

Change-Id: I21e66d7e5bede3ecf1da497dc8b9e20e6f076d54

8 years agoresolve merge conflicts of 46e30fa to nyc-dev-plus-aosp
Glenn Kasten [Fri, 25 Mar 2016 22:24:42 +0000 (15:24 -0700)]
resolve merge conflicts of 46e30fa to nyc-dev-plus-aosp

Change-Id: I9101161378720bdb8da689255050e8e803b59948

8 years agoMerge "Fix build warnings" into nyc-dev
Glenn Kasten [Fri, 25 Mar 2016 21:48:04 +0000 (21:48 +0000)]
Merge "Fix build warnings" into nyc-dev

8 years agoCamera: Update device HAL version in HAL docs to 3.4
Eino-Ville Talvala [Thu, 24 Mar 2016 23:13:54 +0000 (23:13 +0000)]
Camera: Update device HAL version in HAL docs to 3.4
am: 0477854

* commit '0477854868fda8f877e21e1e18474e24c14bb8d7':
  Camera: Update device HAL version in HAL docs to 3.4

8 years agoCamera: Update device HAL version in HAL docs to 3.4
Eino-Ville Talvala [Thu, 24 Mar 2016 21:38:29 +0000 (14:38 -0700)]
Camera: Update device HAL version in HAL docs to 3.4

Bug: 26070606
Change-Id: Ied60b60772ae1cbc3e6e923ef50f9c50e8e8b74b

8 years agoFix build warnings
Glenn Kasten [Thu, 24 Mar 2016 18:51:39 +0000 (11:51 -0700)]
Fix build warnings

Change-Id: Ifed20ea1c34426d837208b5654c180d6c359c6ec

8 years agoMake build warnings be errors
Glenn Kasten [Thu, 24 Mar 2016 18:44:31 +0000 (11:44 -0700)]
Make build warnings be errors

Change-Id: Ib8dc0b9fdecb414b46ca2db63809ce1ae1ea736e

8 years agoUse audio_module_handle_t and audio_patch_handle_t consistently
Glenn Kasten [Thu, 10 Mar 2016 20:42:47 +0000 (12:42 -0800)]
Use audio_module_handle_t and audio_patch_handle_t consistently

Bug: 27814144
Change-Id: I54b7a73ec318779fd3addb060998f4d94141152d

8 years agoMerge "audioservice: Fix spacing in error message."
Jorge Lucangeli Obes [Fri, 18 Mar 2016 20:35:37 +0000 (20:35 +0000)]
Merge "audioservice: Fix spacing in error message."
am: 2d74403

* commit '2d744034dd491a94a44a95fe45e8a3a3270e96d4':
  audioservice: Fix spacing in error message.

8 years agoMerge "audioservice: Fix spacing in error message."
Jorge Lucangeli Obes [Fri, 18 Mar 2016 20:27:07 +0000 (20:27 +0000)]
Merge "audioservice: Fix spacing in error message."

8 years agoaudioservice: Fix spacing in error message.
Jorge Lucangeli Obes [Fri, 18 Mar 2016 20:20:02 +0000 (13:20 -0700)]
audioservice: Fix spacing in error message.

The current message looks weird:

[WARNING:audio_device_handler.cpp(98)] Kernel does not have wired headset support.
Could not open /sys/class/switch/h2w/state( FILE_ERROR_NOT_FOUND )

Notice the ( is not separated from the end of the filename.

Change to:

Could not open /sys/class/switch/h2w/state (FILE_ERROR_NOT_FOUND).

Which IMHO looks better.

Bug: 27743736
Change-Id: Ide7015b7c67702486955cf8406d6163d24729e63

8 years agoMerge "Update audio_route to properly handle long values" into nyc-dev
Andy Hung [Thu, 17 Mar 2016 19:48:07 +0000 (19:48 +0000)]
Merge "Update audio_route to properly handle long values" into nyc-dev
am: 0296a8e

* commit '0296a8ecbc584c6673b835000dd3eb940bcba37a':
  Update audio_route to properly handle long values

8 years agoMerge "Update audio_route to properly handle long values" into nyc-dev
Andy Hung [Thu, 17 Mar 2016 19:41:47 +0000 (19:41 +0000)]
Merge "Update audio_route to properly handle long values" into nyc-dev

8 years agoUpdate audio_route to properly handle long values
Andy Hung [Mon, 7 Mar 2016 22:57:15 +0000 (14:57 -0800)]
Update audio_route to properly handle long values

Required for 64 bit audioserver.

Bug: 27479136
Change-Id: Ic6f2d047648898fcbac43f325020d331f349c718

8 years agoMerge "Use audio_session_t consistently" into nyc-dev
Glenn Kasten [Thu, 17 Mar 2016 18:21:28 +0000 (18:21 +0000)]
Merge "Use audio_session_t consistently" into nyc-dev
am: 8371ca2

* commit '8371ca226d8dbfb8e10ddbe8543b734591fe7c1c':
  Use audio_session_t consistently

8 years agoMerge "Use audio_session_t consistently" into nyc-dev
Glenn Kasten [Thu, 17 Mar 2016 14:22:50 +0000 (14:22 +0000)]
Merge "Use audio_session_t consistently" into nyc-dev

8 years agoMerge "spdif: add support for type-2 e-ac3 streams"
Ashok Mudithanapalli [Mon, 14 Mar 2016 16:14:42 +0000 (16:14 +0000)]
Merge "spdif: add support for type-2 e-ac3 streams"
am: 27602c1895

* commit '27602c1895fec8ff43c37a45f06eb00e9b441c90':
  spdif: add support for type-2 e-ac3 streams

8 years agoMerge "spdif: add support for type-2 e-ac3 streams"
Eric Laurent [Mon, 14 Mar 2016 16:03:13 +0000 (16:03 +0000)]
Merge "spdif: add support for type-2 e-ac3 streams"

8 years agoaudio: new max audio stream type value for policy use
Eric Laurent [Fri, 11 Mar 2016 19:03:26 +0000 (19:03 +0000)]
audio: new max audio stream type value for policy use
am: 7b29a90309

* commit '7b29a903091fb51b30bcc6f3f7a7323d00b2a96d':
  audio: new max audio stream type value for policy use

8 years agoaudio: new max audio stream type value for policy use
Eric Laurent [Fri, 11 Mar 2016 17:59:48 +0000 (09:59 -0800)]
audio: new max audio stream type value for policy use

Added AUDIO_STREAM_FOR_POLICY_CNT value to audio_stream_type_t enum.
All stream types above are ignored by audio policy for volume control
and don't have a matching strategy.
Currently only AUDIO_STREAM_PATCH is in this category.

Bug: 27586382
Change-Id: I6df84d843d3afe4a30788b8f01b32fddffb22ee1

8 years agoUse audio_session_t consistently
Glenn Kasten [Thu, 10 Mar 2016 17:57:27 +0000 (09:57 -0800)]
Use audio_session_t consistently

Bug: 27562099
Change-Id: Ic3d1578e16188be1c5075bab092493dd30db003e

8 years agoCamera: add device custom scene mode enum
Yin-Chia Yeh [Thu, 10 Mar 2016 00:29:35 +0000 (00:29 +0000)]
Camera: add device custom scene mode enum
am: ff19a6214d

* commit 'ff19a6214d5ac43db1aef0129b78c84d550d55e6':
  Camera: add device custom scene mode enum

8 years agoCamera: add device custom scene mode enum
Yin-Chia Yeh [Wed, 9 Mar 2016 22:44:14 +0000 (14:44 -0800)]
Camera: add device custom scene mode enum

Bug: 26687007
Change-Id: I8873b9caf27ccdb7b9ea3c36c106ab6628472b49

8 years agoresolve merge conflicts of 4ac5d298be to nyc-dev-plus-aosp
Glenn Kasten [Wed, 9 Mar 2016 16:43:05 +0000 (08:43 -0800)]
resolve merge conflicts of 4ac5d298be to nyc-dev-plus-aosp

Change-Id: I15a87a79d8336fe1276dc85e5cd65dbca21601ca

8 years agoMerge "alsa_utils: modify period size calculation" into nyc-dev
Glenn Kasten [Wed, 9 Mar 2016 15:49:41 +0000 (15:49 +0000)]
Merge "alsa_utils: modify period size calculation" into nyc-dev

8 years agoalsa_utils: modify period size calculation
Apratim Utkarsh [Tue, 22 Dec 2015 10:47:07 +0000 (16:17 +0530)]
alsa_utils: modify period size calculation

Retrieve period duration from system property.
Also remove multiplier "2" used in min period size calculation.
Change default period size for USB audio to 5ms.

Bug: 27530068
Change-Id: Ia55f4e4501edf824045cd062076e0770833c6540

8 years agoMerge "alsa_utils: modify period size calculation" am: 5f52f5c259
Apratim Utkarsh [Tue, 8 Mar 2016 07:41:51 +0000 (07:41 +0000)]
Merge "alsa_utils: modify period size calculation" am: 5f52f5c259
am: 1ce72a8349

* commit '1ce72a834981ff32740bf344f765e45648037671':
  alsa_utils: modify period size calculation

8 years agoMerge "alsa_utils: modify period size calculation"
Apratim Utkarsh [Mon, 7 Mar 2016 22:45:23 +0000 (22:45 +0000)]
Merge "alsa_utils: modify period size calculation"
am: 5f52f5c259

* commit '5f52f5c259d0a988ee3e8a773468f829f4426d37':
  alsa_utils: modify period size calculation

8 years agoMerge "alsa_utils: modify period size calculation"
Glenn Kasten [Mon, 7 Mar 2016 22:31:00 +0000 (22:31 +0000)]
Merge "alsa_utils: modify period size calculation"

8 years agoalsa_utils: modify period size calculation
Apratim Utkarsh [Tue, 22 Dec 2015 10:47:07 +0000 (16:17 +0530)]
alsa_utils: modify period size calculation

Retrieve period duration from system property.
Also remove multiplier "2" used in min period size calculation.
To keep default USB audio behavior same increase default period
size to 10ms.

Change-Id: Ia55f4e4501edf824045cd062076e0770833c6540

8 years agoCamera: codegen update
Yin-Chia Yeh [Mon, 7 Mar 2016 21:42:19 +0000 (21:42 +0000)]
Camera: codegen update
am: 8b867934df

* commit '8b867934df43494b07c6d51aa6feab17cd64b3d2':
  Camera: codegen update

8 years agoCamera: NDK header codegen update
Yin-Chia Yeh [Fri, 4 Mar 2016 21:32:07 +0000 (21:32 +0000)]
Camera: NDK header codegen update
am: 1651747624

* commit '165174762416099724f03ede34281d9c8275f83a':
  Camera: NDK header codegen update

8 years agoCamera: codegen update
Yin-Chia Yeh [Thu, 3 Mar 2016 23:38:33 +0000 (15:38 -0800)]
Camera: codegen update

Add unordered_set of system tags for quick lookup.

Bug: 27102995
Change-Id: I4812f37e7f0a1a65040b227c4dba9b3fec63021d

8 years agoCamera: NDK header codegen update
Yin-Chia Yeh [Wed, 2 Mar 2016 23:52:03 +0000 (15:52 -0800)]
Camera: NDK header codegen update

1. Hide system keys entirely
2. Hide metadta section if all keys are system key

Bug: 27102995
Change-Id: I80f4d71437951b6bbb8849e977b588d81b04bdff

8 years agoMerge "Camera: codegen CameraDeviceInfo collection" into nyc-dev
Yin-Chia Yeh [Tue, 1 Mar 2016 22:03:49 +0000 (22:03 +0000)]
Merge "Camera: codegen CameraDeviceInfo collection" into nyc-dev
am: 29d6c5cef3

* commit '29d6c5cef33f79ac93f0e412a6cffb39f54261ba':
  Camera: codegen CameraDeviceInfo collection

8 years agoMerge "Add use for audio_unique_id_t" into nyc-dev
Glenn Kasten [Tue, 1 Mar 2016 22:03:34 +0000 (22:03 +0000)]
Merge "Add use for audio_unique_id_t" into nyc-dev
am: 65be8056a5

* commit '65be8056a5dff56376c8f6112c487bb7a0708487':
  Add use for audio_unique_id_t

8 years agoMerge "Camera: codegen CameraDeviceInfo collection" into nyc-dev
Yin-Chia Yeh [Tue, 1 Mar 2016 21:02:08 +0000 (21:02 +0000)]
Merge "Camera: codegen CameraDeviceInfo collection" into nyc-dev

8 years agoMerge "Add use for audio_unique_id_t" into nyc-dev
Glenn Kasten [Tue, 1 Mar 2016 19:10:48 +0000 (19:10 +0000)]
Merge "Add use for audio_unique_id_t" into nyc-dev

8 years agoAdd use for audio_unique_id_t
Glenn Kasten [Fri, 26 Feb 2016 19:20:29 +0000 (11:20 -0800)]
Add use for audio_unique_id_t

Bug: 25641253
Bug: 21019153
Change-Id: I4f78dec54c77c6376f9af7e24aef8aee2e88080a

8 years agospdif: add support for type-2 e-ac3 streams
Ashok Mudithanapalli [Mon, 11 Jan 2016 09:04:15 +0000 (14:34 +0530)]
spdif: add support for type-2 e-ac3 streams

Add support for E-AC3 streams which has AC3
coded substreams.

Change-Id: Idbe0e422172e6b4b017c5c7617cd5ff44cb725b0

8 years agoMerge "audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT" into nyc-dev
Phil Burk [Tue, 1 Mar 2016 00:22:15 +0000 (00:22 +0000)]
Merge "audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT" into nyc-dev
am: 69e62bb768

* commit '69e62bb768d2e926b010092435a6816ecd0a5651':
  audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT

8 years agoMerge "audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT" into nyc-dev
Phil Burk [Tue, 1 Mar 2016 00:06:19 +0000 (00:06 +0000)]
Merge "audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT" into nyc-dev

8 years agoCamera: codegen CameraDeviceInfo collection
Yin-Chia Yeh [Wed, 24 Feb 2016 03:18:15 +0000 (19:18 -0800)]
Camera: codegen CameraDeviceInfo collection

Bug: 25983832
Change-Id: Ib84816a0e46c9d03bfb30474b6cbe5161290f015

8 years agoMerge "brillo: Add binder interfaces to brilloaudioservice." am: fbc05586c7
Ralph Nathan [Mon, 29 Feb 2016 17:24:43 +0000 (17:24 +0000)]
Merge "brillo: Add binder interfaces to brilloaudioservice." am: fbc05586c7
am: 3513ec788f

* commit '3513ec788f49a722bbe22d747bed4880dfe99176':
  brillo: Add binder interfaces to brilloaudioservice.

8 years agoMerge "brillo: Add binder interfaces to brilloaudioservice."
Ralph Nathan [Mon, 29 Feb 2016 17:23:14 +0000 (17:23 +0000)]
Merge "brillo: Add binder interfaces to brilloaudioservice."
am: fbc05586c7

* commit 'fbc05586c78f01c73a16c638d3ba8d0c9a392770':
  brillo: Add binder interfaces to brilloaudioservice.

8 years agoMerge "brillo: Add binder interfaces to brilloaudioservice."
Ralph Nathan [Mon, 29 Feb 2016 17:20:28 +0000 (17:20 +0000)]
Merge "brillo: Add binder interfaces to brilloaudioservice."

8 years agobrillo: Add binder interfaces to brilloaudioservice.
Ralph Nathan [Tue, 2 Feb 2016 22:59:27 +0000 (14:59 -0800)]
brillo: Add binder interfaces to brilloaudioservice.

Expose binder interfaces to brilloaudioservice so clients can register
callbacks and communicate with the service.

BUG=26938019
TEST=unittests + manual tests

Change-Id: I60e420b6110bfabb878bd2c2110acc136247b9a4

8 years agoaudio_policy.h: Force use for ENCODED_SURROUND_OUTPUT
Phil Burk [Thu, 25 Feb 2016 00:57:38 +0000 (16:57 -0800)]
audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT

Bug: 26373761
Change-Id: I30cf43f2998370687b876fe0aea9f93c4b22d8ef
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoMerge "audio: add device for audio bus" into nyc-dev
Eric Laurent [Thu, 25 Feb 2016 19:31:30 +0000 (19:31 +0000)]
Merge "audio: add device for audio bus" into nyc-dev
am: a0ef8e5ba5

* commit 'a0ef8e5ba532433cd432a6361fd400c128c4201c':
  audio: add device for audio bus

8 years agoMerge "audio: add device for audio bus" into nyc-dev
Eric Laurent [Thu, 25 Feb 2016 19:28:59 +0000 (19:28 +0000)]
Merge "audio: add device for audio bus" into nyc-dev

8 years agoMerge "Eliminates gcc warnings from -Wparentheses" into nyc-dev
Ryan Haining [Thu, 25 Feb 2016 02:09:41 +0000 (02:09 +0000)]
Merge "Eliminates gcc warnings from -Wparentheses" into nyc-dev
am: 16a696d1d9

* commit '16a696d1d936f11600a7f621257fb28aa2821400':
  Eliminates gcc warnings from -Wparentheses

8 years agoMerge "Eliminates gcc warnings from -Wparentheses" into nyc-dev
Ryan Haining [Thu, 25 Feb 2016 01:29:46 +0000 (01:29 +0000)]
Merge "Eliminates gcc warnings from -Wparentheses" into nyc-dev

8 years agoMerge "Run \'brilloaudioservice\' as \'audioserver\' user." am: 2676eea62c
Jorge Lucangeli Obes [Thu, 25 Feb 2016 00:14:33 +0000 (00:14 +0000)]
Merge "Run \'brilloaudioservice\' as \'audioserver\' user." am: 2676eea62c
am: 320838c547

* commit '320838c547e4454a49069df95add1649e8c79837':
  Run 'brilloaudioservice' as 'audioserver' user.

8 years agoMerge "Run \'brilloaudioservice\' as \'audioserver\' user."
Jorge Lucangeli Obes [Thu, 25 Feb 2016 00:04:46 +0000 (00:04 +0000)]
Merge "Run \'brilloaudioservice\' as \'audioserver\' user."
am: 2676eea62c

* commit '2676eea62c5ed1ea5b4e9249d98fd97f3c3bb065':
  Run 'brilloaudioservice' as 'audioserver' user.

8 years agoMerge "Run 'brilloaudioservice' as 'audioserver' user."
Jorge Lucangeli Obes [Wed, 24 Feb 2016 23:42:06 +0000 (23:42 +0000)]
Merge "Run 'brilloaudioservice' as 'audioserver' user."

8 years agoAdd structure for basic audio configuration parameters
Jean-Michel Trivi [Wed, 24 Feb 2016 17:13:36 +0000 (17:13 +0000)]
Add structure for basic audio configuration parameters
am: 5413dc382b

* commit '5413dc382ba613605086f4dcae9423df82d6a932':
  Add structure for basic audio configuration parameters

8 years agoAdd structure for basic audio configuration parameters
Jean-Michel Trivi [Thu, 18 Feb 2016 01:45:08 +0000 (17:45 -0800)]
Add structure for basic audio configuration parameters

Bug 26798796

Change-Id: Ifacbbd87d9827c699ecb18884297202beb330219

8 years agoaudio: add device for audio bus
Eric Laurent [Tue, 23 Feb 2016 02:58:37 +0000 (18:58 -0800)]
audio: add device for audio bus

Add audio device category representing a bus in the
audio subsystem. E.g a set of channels in MOST automotive bus.

Bug: 25448664
Change-Id: I7409d5c0a9856db720924b3b9bf39ac89bcf2527

8 years agoEliminates gcc warnings from -Wparentheses
Ryan Haining [Wed, 3 Feb 2016 22:52:29 +0000 (14:52 -0800)]
Eliminates gcc warnings from -Wparentheses

I've been getting a lot of warnings on these lines of the form: suggest
parentheses around arithmetic in operand of '|' [-Wparentheses]

Change-Id: Iee1b333eff3a77f3fbeba715bb569c7fd76a3f97