OSDN Git Service

android-x86/system-media.git
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 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 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

8 years agoRun 'brilloaudioservice' as 'audioserver' user.
Jorge Lucangeli Obes [Tue, 23 Feb 2016 01:43:44 +0000 (17:43 -0800)]
Run 'brilloaudioservice' as 'audioserver' user.

Android already includes an 'audioserver' user so reuse that user
instead of adding a new one. Nothing else in Brillo uses that user
(no pun intended.)

Bug: 27299198
Change-Id: I76764f6a5912dcb7f42879b2a85396420265f17a

8 years agoCamera: Set warnings as errors, and fix a few of them
Eino-Ville Talvala [Fri, 19 Feb 2016 21:18:10 +0000 (21:18 +0000)]
Camera: Set warnings as errors, and fix a few of them
am: aa7948f4cb

* commit 'aa7948f4cba3db04dd42586f5d06711f443e0c56':
  Camera: Set warnings as errors, and fix a few of them

8 years agoCamera: Set warnings as errors, and fix a few of them
Eino-Ville Talvala [Thu, 18 Feb 2016 21:18:20 +0000 (13:18 -0800)]
Camera: Set warnings as errors, and fix a few of them

Bug: 27149500
Change-Id: Iddccb3bb7f0ca229d4c42f68d0c80fa91c3c4665

8 years agoMerge commit \'d858bc49ed6bb69006b6bc8df8767e0dcf1c4c8b\' into HEAD
Bill Yi [Wed, 17 Feb 2016 21:08:28 +0000 (21:08 +0000)]
Merge commit \'d858bc49ed6bb69006b6bc8df8767e0dcf1c4c8b\' into HEAD
am: 5e68e650bc

* commit '5e68e650bc43f2c0ca175c662fce0183021e3529':

8 years agoMerge commit 'd858bc49ed6bb69006b6bc8df8767e0dcf1c4c8b' into HEAD
Bill Yi [Wed, 17 Feb 2016 17:51:18 +0000 (09:51 -0800)]
Merge commit 'd858bc49ed6bb69006b6bc8df8767e0dcf1c4c8b' into HEAD

8 years agoMerge "Fix false positive memory leak warning."
Chih-hung Hsieh [Sat, 13 Feb 2016 01:32:09 +0000 (01:32 +0000)]
Merge "Fix false positive memory leak warning."
am: 9147c5ff90

* commit '9147c5ff900f17df6995d171ee336e21e254383a':
  Fix false positive memory leak warning.

8 years agoMerge "Camera: Fix warnings" into nyc-dev
Eino-Ville Talvala [Sat, 13 Feb 2016 00:24:16 +0000 (00:24 +0000)]
Merge "Camera: Fix warnings" into nyc-dev
am: 04655468fd

* commit '04655468fd7296d207a32c1ff821983cc5d7cb65':
  Camera: Fix warnings

8 years agoMerge "Camera: Fix warnings" into nyc-dev
Eino-Ville Talvala [Sat, 13 Feb 2016 00:21:30 +0000 (00:21 +0000)]
Merge "Camera: Fix warnings" into nyc-dev

8 years agoMerge "Fix false positive memory leak warning."
Chih-hung Hsieh [Sat, 13 Feb 2016 00:13:16 +0000 (00:13 +0000)]
Merge "Fix false positive memory leak warning."

8 years agoFix false positive memory leak warning.
Chih-Hung Hsieh [Fri, 12 Feb 2016 22:52:46 +0000 (14:52 -0800)]
Fix false positive memory leak warning.

place_camera_metadata could return NULL only if buffer is NULL.

BUG: 27099839
Change-Id: I1f5c6c0b96e21d1b487a3c3bb0b550760d7ea5c6

8 years agoaudio.h: add ENCODING_IEC61937
Phil Burk [Fri, 12 Feb 2016 22:35:50 +0000 (22:35 +0000)]
audio.h: add ENCODING_IEC61937
am: 97763f31a4

* commit '97763f31a43caaf6b76e99e8d20abcc27141ec52':
  audio.h: add ENCODING_IEC61937

8 years agoMerge "Fix warnings in system/media/audio_utils."
Dan Albert [Fri, 12 Feb 2016 20:18:00 +0000 (20:18 +0000)]
Merge "Fix warnings in system/media/audio_utils."
am: b59932d5ab

* commit 'b59932d5ab6c622e04f10e836a06a586dc20d026':
  Fix warnings in system/media/audio_utils.

8 years agoMerge "Fix warnings in system/media/audio_utils."
Dan Albert [Fri, 12 Feb 2016 20:06:27 +0000 (20:06 +0000)]
Merge "Fix warnings in system/media/audio_utils."

8 years agoFix warnings in system/media/audio_utils.
Dan Albert [Wed, 3 Feb 2016 00:43:45 +0000 (16:43 -0800)]
Fix warnings in system/media/audio_utils.

* Disable unused-parameter warnings
* Use the right abs function
* %zu

Bug: http://b/26936282
Change-Id: Ic5819df3b34c60a08be59ce7ba13be2ce9045374

8 years agoaudio.h: add ENCODING_IEC61937
Phil Burk [Tue, 19 Jan 2016 21:05:26 +0000 (13:05 -0800)]
audio.h: add ENCODING_IEC61937

Add audio_has_proportional_frames() to replace
audio_is_linear_pcm() in some cases.

Bug: 24541671
Bug: 20891646
Bug: 26373761
Change-Id: I2ec12068b18bfe46213b79c274a59bfeba884157
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoCamera: Fix warnings
Eino-Ville Talvala [Fri, 5 Feb 2016 22:29:29 +0000 (14:29 -0800)]
Camera: Fix warnings

Change-Id: Id627530c8cb8aafb82bef277aa96e6dc2b05fec4

8 years agoMerge "Add an init.rc file for brilloaudioservice." am: 91ce424587
Ralph Nathan [Fri, 5 Feb 2016 19:29:44 +0000 (19:29 +0000)]
Merge "Add an init.rc file for brilloaudioservice." am: 91ce424587
am: c18ae94d05

* commit 'c18ae94d05c57990014cc7b7660e733cc7ca3bc9':
  Add an init.rc file for brilloaudioservice.

8 years agoMerge "Add an init.rc file for brilloaudioservice."
Ralph Nathan [Fri, 5 Feb 2016 19:27:54 +0000 (19:27 +0000)]
Merge "Add an init.rc file for brilloaudioservice."
am: 91ce424587

* commit '91ce424587d589a486a3ef2a25297d82b6bba39f':
  Add an init.rc file for brilloaudioservice.

8 years agoMerge "Add an init.rc file for brilloaudioservice."
Ralph Nathan [Fri, 5 Feb 2016 19:23:50 +0000 (19:23 +0000)]
Merge "Add an init.rc file for brilloaudioservice."

8 years agoAdd an init.rc file for brilloaudioservice.
Ralph Nathan [Thu, 4 Feb 2016 19:10:43 +0000 (11:10 -0800)]
Add an init.rc file for brilloaudioservice.

Start brilloaudioservice on init.

BUG=26954423
TEST=manual test

Change-Id: I425ad9e1cd71badfd951dc375118c38e94e64581

8 years agoMerge "Add limiter for mono blend"
Glenn Kasten [Wed, 3 Feb 2016 23:07:11 +0000 (23:07 +0000)]
Merge "Add limiter for mono blend"

8 years agoMerge "Fix warnings in system/media/camera." am: 6ebfda2cbc
Dan Albert [Wed, 3 Feb 2016 02:29:07 +0000 (02:29 +0000)]
Merge "Fix warnings in system/media/camera." am: 6ebfda2cbc
am: 25bf9d953e

* commit '25bf9d953edbafc823487340bd13a712052d9e8e':
  Fix warnings in system/media/camera.

8 years agoMerge "Fix warnings in system/media/camera."
Dan Albert [Wed, 3 Feb 2016 02:27:11 +0000 (02:27 +0000)]
Merge "Fix warnings in system/media/camera."
am: 6ebfda2cbc

* commit '6ebfda2cbc67607cac6e39da03ed6fb421a087a3':
  Fix warnings in system/media/camera.

8 years agoMerge "Fix warnings in system/media/camera."
Dan Albert [Wed, 3 Feb 2016 02:23:07 +0000 (02:23 +0000)]
Merge "Fix warnings in system/media/camera."

8 years agoFix warnings in system/media/camera.
Dan Albert [Tue, 2 Feb 2016 23:20:52 +0000 (15:20 -0800)]
Fix warnings in system/media/camera.

Bug: http://b/26936282
Change-Id: Ibc4830838c471272ad25e78a0c1ea098175ac6cc

8 years agoAdd limiter for mono blend
Glenn Kasten [Thu, 28 Jan 2016 01:21:35 +0000 (17:21 -0800)]
Add limiter for mono blend

Bug: 26904791
Change-Id: Ic325d0ab328e1c7ffea2ea04bf3fc13cd3742285

8 years agoMerge "brillo: Add service to detect audio devices." am: 3c8d4e1992
Ralph Nathan [Thu, 28 Jan 2016 21:58:15 +0000 (21:58 +0000)]
Merge "brillo: Add service to detect audio devices." am: 3c8d4e1992
am: bff68e3238

* commit 'bff68e3238de1f12ec383a939e6d3c59c4218f56':
  brillo: Add service to detect audio devices.

8 years agoMerge "brillo: Add service to detect audio devices."
Ralph Nathan [Thu, 28 Jan 2016 21:55:49 +0000 (21:55 +0000)]
Merge "brillo: Add service to detect audio devices."
am: 3c8d4e1992

* commit '3c8d4e1992315c778bd547dade13a71f6bb9e461':
  brillo: Add service to detect audio devices.

8 years agoMerge "brillo: Add service to detect audio devices."
Ralph Nathan [Thu, 28 Jan 2016 21:51:16 +0000 (21:51 +0000)]
Merge "brillo: Add service to detect audio devices."

8 years agoMerge "Adds fields for SoundTrigger GenericSoundModel"
Ryan Bavetta [Thu, 28 Jan 2016 03:06:30 +0000 (03:06 +0000)]
Merge "Adds fields for SoundTrigger GenericSoundModel"

8 years agoAdds fields for SoundTrigger GenericSoundModel
Ryan Bavetta [Wed, 27 Jan 2016 05:07:43 +0000 (21:07 -0800)]
Adds fields for SoundTrigger GenericSoundModel

BUG: 22860713
Change-Id: I653e915a6c68c185910505e1ca765efe6cd96f1f

8 years agobrillo: Add service to detect audio devices.
Ralph Nathan [Thu, 7 Jan 2016 23:10:32 +0000 (15:10 -0800)]
brillo: Add service to detect audio devices.

Add a native service to detect when audio devices are connected to the
headphone jack and inform the audio system.

BUG=25981491
TEST=manual test on abox_edge + unittests

Change-Id: Ia1ac9efe3008d81b1445c3e471d9c47bb042d921

8 years agoMerge "Camera: Add LEVEL_3 to android.info.supportedHardwareLevel"
Eino-Ville Talvala [Tue, 26 Jan 2016 23:01:12 +0000 (23:01 +0000)]
Merge "Camera: Add LEVEL_3 to android.info.supportedHardwareLevel"

8 years agoCamera: fix typos
Yin-Chia Yeh [Tue, 26 Jan 2016 21:26:56 +0000 (13:26 -0800)]
Camera: fix typos

Change-Id: I98dfd47b6d28f8d1e89e5e82bcc0cd83556f1bd0

8 years agoCamera: codegen NDK metadata tag header
Yin-Chia Yeh [Wed, 23 Dec 2015 00:25:00 +0000 (16:25 -0800)]
Camera: codegen NDK metadata tag header

Bug: 23012001
Change-Id: I049eb42fcf2103854179d841a3dfb51f728905bc

8 years agoMerge "Camera: add post RAW sensitivity keys"
Yin-Chia Yeh [Sat, 23 Jan 2016 23:05:09 +0000 (23:05 +0000)]
Merge "Camera: add post RAW sensitivity keys"