OSDN Git Service

android-x86/system-media.git
8 years agoaudio_utils: add mono_blend conversion
Andy Hung [Sat, 19 Dec 2015 01:37:19 +0000 (17:37 -0800)]
audio_utils: add mono_blend conversion

Bug: 22700363
Change-Id: I6420617add71ee7fe5e59e606d4a3e31521033aa

8 years agoMerge "Camera: define opaqueRawSize static metadata"
Yin-Chia Yeh [Wed, 9 Dec 2015 01:45:14 +0000 (01:45 +0000)]
Merge "Camera: define opaqueRawSize static metadata"

8 years agoCamera: define opaqueRawSize static metadata
Yin-Chia Yeh [Mon, 7 Dec 2015 05:42:35 +0000 (21:42 -0800)]
Camera: define opaqueRawSize static metadata

To describe the size of an opaque RAW buffer.

Bug: 25596619
Change-Id: I119df8f6fafbf24491d29ede7df9f01e0fe39d10

8 years agoMerge "Camera: update new CTS path for metadata-generate script"
Yin-Chia Yeh [Mon, 7 Dec 2015 20:30:43 +0000 (20:30 +0000)]
Merge "Camera: update new CTS path for metadata-generate script"

8 years agoCamera: update new CTS path for metadata-generate script
Yin-Chia Yeh [Sun, 6 Dec 2015 01:20:33 +0000 (17:20 -0800)]
Camera: update new CTS path for metadata-generate script

Change-Id: Ief925fc8ed3c2509a9b87a6cb6b220d33ab38332

8 years agoCamera: update FPS range spec am: 30bf75b88a am: 137dfd45df
Yin-Chia Yeh [Sat, 5 Dec 2015 00:23:16 +0000 (16:23 -0800)]
Camera: update FPS range spec am: 30bf75b88a am: 137dfd45df
am: d858bc49ed

* commit 'd858bc49ed6bb69006b6bc8df8767e0dcf1c4c8b':
  Camera: update FPS range spec

8 years agoCamera: update FPS range spec am: 30bf75b88a
Yin-Chia Yeh [Sat, 5 Dec 2015 00:20:09 +0000 (16:20 -0800)]
Camera: update FPS range spec am: 30bf75b88a
am: 137dfd45df

* commit '137dfd45dfed5ba7176bfd6688b1ca3c447482db':
  Camera: update FPS range spec

8 years agoCamera: update FPS range spec
Yin-Chia Yeh [Sat, 5 Dec 2015 00:02:40 +0000 (16:02 -0800)]
Camera: update FPS range spec
am: 30bf75b88a

* commit '30bf75b88a25a49fdd388fc3c5a77ecbdede2e24':
  Camera: update FPS range spec

8 years agoMerge "Fix build warning"
Glenn Kasten [Thu, 3 Dec 2015 00:18:23 +0000 (00:18 +0000)]
Merge "Fix build warning"

8 years agoMerge "Add README for audio_utils tests"
Glenn Kasten [Wed, 2 Dec 2015 22:22:27 +0000 (22:22 +0000)]
Merge "Add README for audio_utils tests"

8 years agoAdd README for audio_utils tests
Glenn Kasten [Wed, 2 Dec 2015 22:01:58 +0000 (14:01 -0800)]
Add README for audio_utils tests

Change-Id: I808efa831a2848a16608e57d9866575063093c11

8 years agoFix build warning
Glenn Kasten [Wed, 2 Dec 2015 21:58:04 +0000 (13:58 -0800)]
Fix build warning

Change-Id: I4619c0924e52076b0965875ffb2d297ddc8bcec7

8 years agoCamera: update FPS range spec
Yin-Chia Yeh [Fri, 20 Nov 2015 23:16:05 +0000 (15:16 -0800)]
Camera: update FPS range spec

Bug: 25427163
Change-Id: Id020b051f0ee082f9883f9a73fa3ac34540c0cfc

8 years agocamera metadata: update dynamic black level type
Zhijun He [Tue, 24 Nov 2015 22:24:52 +0000 (14:24 -0800)]
camera metadata: update dynamic black level type

They should be floats rather than integers for better precision.

Bug: 23011454
Change-Id: I8c10ff0bc5f07f1d53cdbda36da55b4483f721aa

8 years agocamera_metadata: add dynamic black level support
Zhijun He [Fri, 13 Nov 2015 01:27:27 +0000 (17:27 -0800)]
camera_metadata: add dynamic black level support

Also add the optical black regions static memtadata.

Bug: 23011454
Change-Id: I217f33e89e046991f4cded7f7213ce6793ec4e68

8 years agoCamera: Documentation updates am: 04292697a7 am: ebfd7b869b
Eino-Ville Talvala [Thu, 12 Nov 2015 01:30:49 +0000 (01:30 +0000)]
Camera: Documentation updates am: 04292697a7 am: ebfd7b869b
am: 9cb7c0b212

* commit '9cb7c0b2124b987ac71cada3d203364aa165eb17':
  Camera: Documentation updates

8 years agoCamera: Documentation updates am: 04292697a7
Eino-Ville Talvala [Thu, 12 Nov 2015 01:27:01 +0000 (01:27 +0000)]
Camera: Documentation updates am: 04292697a7
am: ebfd7b869b

* commit 'ebfd7b869b931ddb2b3038ff4ee129a8d436e24e':
  Camera: Documentation updates

8 years agoCamera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:11:01 +0000 (01:11 +0000)]
Camera: Documentation updates
am: 04292697a7

* commit '04292697a7841d6e45e0355c9dc3ced3bbedc768':
  Camera: Documentation updates

8 years agoCamera: Documentation updates
Eino-Ville Talvala [Mon, 9 Nov 2015 02:58:27 +0000 (18:58 -0800)]
Camera: Documentation updates

 - Use preCorrectionActiveArray instead of activeArray
   for one of the possible sizes for raw outputs.

Bug: 23908116
Change-Id: I5f7efb4e399f392b9442ad458335eb0b4777e35c

8 years agoAdd clock to radio metadata.
Sanket Agarwal [Thu, 8 Oct 2015 00:16:21 +0000 (17:16 -0700)]
Add clock to radio metadata.

Bug: b/24807501
Bug: b/22701655

Change-Id: I91c3471f92d2c9600c7a30ceb48fbb25dbc5feea
(cherry picked from commit f59f3ce4728467ab745906c50330413b7d848072)

8 years agoMerge "USB MONOtization issue fix."
Paul Mclean [Thu, 5 Nov 2015 17:00:08 +0000 (17:00 +0000)]
Merge "USB MONOtization issue fix."

8 years agoUSB MONOtization issue fix.
Paul McLean [Tue, 3 Nov 2015 20:25:24 +0000 (12:25 -0800)]
USB MONOtization issue fix.

Profile default outputs to STEREO if available.
Profile default to 48K or 44.1K if available.

Bug: 24366970
Change-Id: Ib3685668ede236d3faf79cd9a471ba0f0bb641c6

8 years agoMerge commit \'7cef57aa96bf6387e81d7e88452eb0c36b52d3d6\' into HEAD am: 87f29acccf
Bill Yi [Tue, 3 Nov 2015 23:47:49 +0000 (23:47 +0000)]
Merge commit \'7cef57aa96bf6387e81d7e88452eb0c36b52d3d6\' into HEAD am: 87f29acccf
am: f47ca66ced

* commit 'f47ca66cedc7ac94482887beff79c9f2bd923d65':

8 years agoMerge commit \'7cef57aa96bf6387e81d7e88452eb0c36b52d3d6\' into HEAD
Bill Yi [Tue, 3 Nov 2015 23:34:19 +0000 (23:34 +0000)]
Merge commit \'7cef57aa96bf6387e81d7e88452eb0c36b52d3d6\' into HEAD
am: 87f29acccf

* commit '87f29acccf177d19dceb3c070eb5e84cce052866':

8 years agoMerge commit '7cef57aa96bf6387e81d7e88452eb0c36b52d3d6' into HEAD
Bill Yi [Tue, 3 Nov 2015 22:30:41 +0000 (14:30 -0800)]
Merge commit '7cef57aa96bf6387e81d7e88452eb0c36b52d3d6' into HEAD

8 years agoMerge "system/media: Add NOTICE and MODULE_LICENSE_* files" am: 280293d781 am: c40280be63
Gaurav Shah [Tue, 3 Nov 2015 13:47:34 +0000 (13:47 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files" am: 280293d781 am: c40280be63
am: f6b01ef787

* commit 'f6b01ef7872fc6c3f9f5df3c833b8738f9c62330':
  system/media: Add NOTICE and MODULE_LICENSE_* files

8 years agoMerge "system/media: Add NOTICE and MODULE_LICENSE_* files" am: 280293d781
Gaurav Shah [Mon, 2 Nov 2015 22:29:52 +0000 (22:29 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files" am: 280293d781
am: c40280be63

* commit 'c40280be637e8b1fa13dc20c84edc6cc61e27853':
  system/media: Add NOTICE and MODULE_LICENSE_* files

8 years agoMerge "system/media: Add NOTICE and MODULE_LICENSE_* files"
Gaurav Shah [Mon, 2 Nov 2015 22:27:03 +0000 (22:27 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files"
am: 280293d781

* commit '280293d781462aff867d92603787c15b222f0c33':
  system/media: Add NOTICE and MODULE_LICENSE_* files

8 years agoMerge "system/media: Add NOTICE and MODULE_LICENSE_* files"
Gaurav Shah [Mon, 2 Nov 2015 22:21:34 +0000 (22:21 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files"

8 years agoMinimal Doxygen
Glenn Kasten [Fri, 30 Oct 2015 21:02:57 +0000 (14:02 -0700)]
Minimal Doxygen

Changed just enough so that output of Doxygen is not ugly.
Did not attempt to add more comments, or fully use Doxygen.

Change-Id: Ia2ec947fd5b249db50fef7cc9feb9ad061019564

8 years agosystem/media: Add NOTICE and MODULE_LICENSE_* files
Gaurav Shah [Fri, 2 Oct 2015 22:46:19 +0000 (15:46 -0700)]
system/media: Add NOTICE and MODULE_LICENSE_* files

BUG: 24604193
Change-Id: Ibaa4513028f876134d4bff970e69f708c2435d35

8 years agoAdd missing delete[]
Glenn Kasten [Wed, 21 Oct 2015 19:55:01 +0000 (12:55 -0700)]
Add missing delete[]

Change-Id: I15c0ecb49d0e82db05e6857c338aa7c07b35598c

8 years agoam 7cef57aa: am dce0eca3: fix usb audio for devices with more than 8 channels
Andy Hung [Fri, 9 Oct 2015 16:33:02 +0000 (16:33 +0000)]
am 7cef57aa: am dce0eca3: fix usb audio for devices with more than 8 channels

* commit '7cef57aa96bf6387e81d7e88452eb0c36b52d3d6':
  fix usb audio for devices with more than 8 channels

8 years agoam dce0eca3: fix usb audio for devices with more than 8 channels
Andy Hung [Fri, 9 Oct 2015 16:28:57 +0000 (16:28 +0000)]
am dce0eca3: fix usb audio for devices with more than 8 channels

* commit 'dce0eca34eab2016d6d11cb32f072db4079a4461':
  fix usb audio for devices with more than 8 channels

8 years agoam eec5fcc1: am 2d950898: Camera: update video stabilization API doc.
Jianing Wei [Fri, 2 Oct 2015 02:34:23 +0000 (02:34 +0000)]
am eec5fcc1: am 2d950898: Camera: update video stabilization API doc.

* commit 'eec5fcc1c3e98f39ef733381b235ce32e79bd0b5':
  Camera: update video stabilization API doc.

8 years agoam 2d950898: Camera: update video stabilization API doc.
Jianing Wei [Fri, 2 Oct 2015 02:29:21 +0000 (02:29 +0000)]
am 2d950898: Camera: update video stabilization API doc.

* commit '2d950898d4dc311ecfd2b64ea8880656dd6a14fa':
  Camera: update video stabilization API doc.

8 years agofix usb audio for devices with more than 8 channels
Andy Hung [Mon, 28 Sep 2015 23:31:54 +0000 (16:31 -0700)]
fix usb audio for devices with more than 8 channels

Use the lowest 8 channels.

Bug: 24468939
Change-Id: If116133ab3c902cc6d431b287058897c8e3af875
(cherry picked from commit 67c63b290460f36f7841d6f01017bb116a2a36f1)

8 years agoam c181b872: am 209b49f9: am 24ba4816: Merge "Update libaudioutils for host"
Colin Cross [Thu, 1 Oct 2015 00:50:46 +0000 (00:50 +0000)]
am c181b872: am 209b49f9: am 24ba4816: Merge "Update libaudioutils for host"

* commit 'c181b872ca0be1c4eee5b91689445934be17153b':
  Update libaudioutils for host

8 years agoam 209b49f9: am 24ba4816: Merge "Update libaudioutils for host"
Colin Cross [Thu, 1 Oct 2015 00:46:57 +0000 (00:46 +0000)]
am 209b49f9: am 24ba4816: Merge "Update libaudioutils for host"

* commit '209b49f902ba6f4945c32720db65e359a5c43cd2':
  Update libaudioutils for host

8 years agoam 24ba4816: Merge "Update libaudioutils for host"
Colin Cross [Thu, 1 Oct 2015 00:38:57 +0000 (00:38 +0000)]
am 24ba4816: Merge "Update libaudioutils for host"

* commit '24ba4816f378b0f87011ced509f873d437969760':
  Update libaudioutils for host

8 years agoMerge "Update libaudioutils for host"
Colin Cross [Thu, 1 Oct 2015 00:33:45 +0000 (00:33 +0000)]
Merge "Update libaudioutils for host"

8 years agoUpdate libaudioutils for host
Glenn Kasten [Wed, 14 Jan 2015 01:04:09 +0000 (17:04 -0800)]
Update libaudioutils for host

Change-Id: Ic10f786952dffc29e3ce0399cb72ce1cec4055e2
(cherry picked from commit 4504b3372c0979614e2abcc6b3fa463dcd4d141b)

8 years agoam 2714ceb2: am 14b65781: am 50382728: Merge "Fix Mac build"
Glenn Kasten [Wed, 30 Sep 2015 23:58:18 +0000 (23:58 +0000)]
am 2714ceb2: am 14b65781: am 50382728: Merge "Fix Mac build"

* commit '2714ceb2b4baf2cc256742a72875c8ee4251c57a':
  Fix Mac build

8 years agoam db778f49: am 5f125ab1: resolved conflicts for dd82cb0f to stage-aosp-master
Glenn Kasten [Wed, 30 Sep 2015 23:58:17 +0000 (23:58 +0000)]
am db778f49: am 5f125ab1: resolved conflicts for dd82cb0f to stage-aosp-master

* commit 'db778f498a657c08096fb4abde5a23bea52a709c':
  Add fifo_tests

8 years agoam 14b65781: am 50382728: Merge "Fix Mac build"
Glenn Kasten [Wed, 30 Sep 2015 23:51:04 +0000 (23:51 +0000)]
am 14b65781: am 50382728: Merge "Fix Mac build"

* commit '14b65781f2e13b19ca294c88052aafd84ad4ccdf':
  Fix Mac build

8 years agoam 5f125ab1: resolved conflicts for dd82cb0f to stage-aosp-master
Glenn Kasten [Wed, 30 Sep 2015 23:51:03 +0000 (23:51 +0000)]
am 5f125ab1: resolved conflicts for dd82cb0f to stage-aosp-master

* commit '5f125ab174f7d7a9e10a47f6af16cdd85c0253a7':
  Add fifo_tests

8 years agoam 50382728: Merge "Fix Mac build"
Glenn Kasten [Wed, 30 Sep 2015 23:43:53 +0000 (23:43 +0000)]
am 50382728: Merge "Fix Mac build"

* commit '503827280a2addfbc1215c891d80ce9258732e89':
  Fix Mac build

8 years agoresolved conflicts for dd82cb0f to stage-aosp-master
Glenn Kasten [Wed, 30 Sep 2015 23:39:47 +0000 (16:39 -0700)]
resolved conflicts for dd82cb0f to stage-aosp-master

Change-Id: I783e4dac71eb568fdd527399a95b270c0e6f7090

8 years agoMerge "Fix Mac build"
Glenn Kasten [Wed, 30 Sep 2015 21:49:26 +0000 (21:49 +0000)]
Merge "Fix Mac build"

8 years agoMerge "Add fifo_tests"
Glenn Kasten [Wed, 30 Sep 2015 21:49:06 +0000 (21:49 +0000)]
Merge "Add fifo_tests"

8 years agoFix Mac build
Jim Miller [Sat, 6 Jun 2015 00:34:31 +0000 (17:34 -0700)]
Fix Mac build

ssize_t wasn't being picked because system headers weren't included
first.

Change-Id: I7748fedaa0c85ed9696e8ef77b0086ecf17ebe29

8 years agoAdd fifo_tests
Glenn Kasten [Wed, 14 Jan 2015 00:25:39 +0000 (16:25 -0800)]
Add fifo_tests

Change-Id: I62a783bf551fd6c6c9e734b550f8bcc4e2a32df3

8 years agoCamera: update video stabilization API doc.
Jianing Wei [Tue, 29 Sep 2015 21:01:43 +0000 (14:01 -0700)]
Camera: update video stabilization API doc.

Update the video stabilization API description
to specify which scenarios guarantee stabilization
is performed if the control is set to ON and the
static metadata supports stabilization ON.

Bug: 23353979
Change-Id: I0f8662864e1c397c0a53edf11a685de2f6feb7f2

8 years agofix usb audio for devices with more than 8 channels
Andy Hung [Mon, 28 Sep 2015 23:31:54 +0000 (16:31 -0700)]
fix usb audio for devices with more than 8 channels

Use the lowest 8 channels.

Bug: 24468939
Change-Id: If116133ab3c902cc6d431b287058897c8e3af875

8 years agoam 563c5166: am eac7b41c: Merge "camera: allow 0-sized metadata entries"
Eino-Ville Talvala [Sat, 19 Sep 2015 20:00:14 +0000 (20:00 +0000)]
am 563c5166: am eac7b41c: Merge "camera: allow 0-sized metadata entries"

* commit '563c5166f104621d97fbc17eb4b152182decb6b8':
  camera: allow 0-sized metadata entries

8 years agoam eac7b41c: Merge "camera: allow 0-sized metadata entries"
Eino-Ville Talvala [Sat, 19 Sep 2015 19:52:20 +0000 (19:52 +0000)]
am eac7b41c: Merge "camera: allow 0-sized metadata entries"

* commit 'eac7b41cd6929deab56f2cf9e4e918be75bf826c':
  camera: allow 0-sized metadata entries

8 years agoMerge "camera: allow 0-sized metadata entries"
Eino-Ville Talvala [Fri, 18 Sep 2015 21:04:17 +0000 (21:04 +0000)]
Merge "camera: allow 0-sized metadata entries"

8 years agocamera: allow 0-sized metadata entries
David Schalig [Sun, 15 Jun 2014 18:22:50 +0000 (11:22 -0700)]
camera: allow 0-sized metadata entries

0-sized metadata entries were rejected in
update_camera_metadata_entry() when the data pointer
was NULL, but accepted when it was not NULL.

This prevents return of empty array-type camera properties,
which is a valid case for some dynamic properties, e.g.
number of detected face rectangles.

Change-Id: I4e69d889fb416fd256a81e877f3a5aa43c253796
Signed-off-by: David Schalig <dschalig@nvidia.com>
8 years agoam c3b3e366: (-s ours) am c572dfc4: Camera: Fix spelling of quaternion, fix metadata...
Eino-Ville Talvala [Thu, 27 Aug 2015 12:20:58 +0000 (12:20 +0000)]
am c3b3e366: (-s ours) am c572dfc4: Camera: Fix spelling of quaternion, fix metadata ordering issue

* commit 'c3b3e366b86aa7e16693d67b1ebe955c46b3c067':

8 years agoam 1431a49a: (-s ours) am 80f17ac6: Merge "Add USB proxy_get_presentation_position...
Glenn Kasten [Thu, 27 Aug 2015 12:20:57 +0000 (12:20 +0000)]
am 1431a49a: (-s ours) am 80f17ac6: Merge "Add USB proxy_get_presentation_position() for timestamps" into mnc-dev

* commit '1431a49ab0a78e321564d7d0955069fb773c7a49':

8 years agoam e31d70c4: (-s ours) am cf6443f4: Audio HAL API: add bit for compressed audio
Phil Burk [Thu, 27 Aug 2015 12:20:55 +0000 (12:20 +0000)]
am e31d70c4: (-s ours) am cf6443f4: Audio HAL API: add bit for compressed audio

* commit 'e31d70c4a65f89ef2e4c80741010659b54005732':

8 years agoam 6b45aace: (-s ours) am 8b6721ca: Merge "Camera2: Update FAST mode for EE and NR...
Chien-Yu Chen [Thu, 27 Aug 2015 12:20:54 +0000 (12:20 +0000)]
am 6b45aace: (-s ours) am 8b6721ca: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev

* commit '6b45aace870adab6c5d5156a1d1befd727a20e1a':

8 years agoam 66884d2b: (-s ours) am 570c195f: Merge "Camera: clarify largest JPEG dimension...
Yin-Chia Yeh [Thu, 27 Aug 2015 12:20:52 +0000 (12:20 +0000)]
am 66884d2b: (-s ours) am 570c195f: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev

* commit '66884d2ba601046829d8791828ed330b60739a33':

8 years agoam 01ca5255: (-s ours) am ce1319b9: Camera metadata: fix typos.
Andy Huibers [Thu, 27 Aug 2015 12:20:49 +0000 (12:20 +0000)]
am 01ca5255: (-s ours) am ce1319b9: Camera metadata: fix typos.

* commit '01ca52551d56f6ddf17efb6d6fee0c9755f4c76d':

8 years agoam b7567077: (-s ours) am 0627da9d: Merge "audio: fix audio_device_is_digital() funct...
Eric Laurent [Thu, 27 Aug 2015 12:20:47 +0000 (12:20 +0000)]
am b7567077: (-s ours) am 0627da9d: Merge "audio: fix audio_device_is_digital() function." into mnc-dev

* commit 'b756707700b0f37d711344a9b937a407f2c2c088':

8 years agoam 41038a40: (-s ours) am f55c1a85: Camera: Update API references for high-speed...
Eino-Ville Talvala [Thu, 27 Aug 2015 12:20:46 +0000 (12:20 +0000)]
am 41038a40: (-s ours) am f55c1a85: Camera: Update API references for high-speed recording refactor

* commit '41038a402a9f4a206cbb73674f6a8d9987c158ad':

8 years agoam ecd6537d: (-s ours) am bdc55b4b: Merge "SPDIFEncoder: EAC3 fixes from NVidia"...
Phil Burk [Thu, 27 Aug 2015 12:20:45 +0000 (12:20 +0000)]
am ecd6537d: (-s ours) am bdc55b4b: Merge "SPDIFEncoder: EAC3 fixes from NVidia" into mnc-dev

* commit 'ecd6537d39457d6dcbc30e0fc181ad6d86ac78bb':

8 years agoam e54494cf: (-s ours) am d91ea14b: Camera: Enforce ZERO_SHUTTER_LAG mode
Chien-Yu Chen [Thu, 27 Aug 2015 12:20:44 +0000 (12:20 +0000)]
am e54494cf: (-s ours) am d91ea14b: Camera: Enforce ZERO_SHUTTER_LAG mode

* commit 'e54494cf1c2761f19bca8f2202fa5e0571f8179b':

8 years agoam 5f2936e7: (-s ours) am 073e4589: Camera: Add ZERO_SHUTTER_LAG modes to noise reduc...
Eino-Ville Talvala [Thu, 27 Aug 2015 12:20:43 +0000 (12:20 +0000)]
am 5f2936e7: (-s ours) am 073e4589: Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement

* commit '5f2936e7bdeefd96f6f7dac62bc4ab077bf88576':

8 years agoam 2fa7e841: (-s ours) am 7d27e250: Merge "audio: add definitions for devices connect...
Eric Laurent [Thu, 27 Aug 2015 12:20:42 +0000 (12:20 +0000)]
am 2fa7e841: (-s ours) am 7d27e250: Merge "audio: add definitions for devices connected over IP" into mnc-dev

* commit '2fa7e8416d75076fdb737d2cd88641b860c310cc':

8 years agoam 75b72739: (-s ours) am d29ff8c2: Merge "Camera: Remove FREEFORM cropping requireme...
Eino-Ville Talvala [Thu, 27 Aug 2015 12:20:40 +0000 (12:20 +0000)]
am 75b72739: (-s ours) am d29ff8c2: Merge "Camera: Remove FREEFORM cropping requirement from FULL" into mnc-dev

* commit '75b72739d9dec11d1586c6d3139adf607dd36420':

8 years agoam c572dfc4: Camera: Fix spelling of quaternion, fix metadata ordering issue
Eino-Ville Talvala [Sat, 22 Aug 2015 00:47:52 +0000 (00:47 +0000)]
am c572dfc4: Camera: Fix spelling of quaternion, fix metadata ordering issue

* commit 'c572dfc4530060fa757f440f215afb57ae9c9c02':
  Camera: Fix spelling of quaternion, fix metadata ordering issue

8 years agoam c572dfc4: Camera: Fix spelling of quaternion, fix metadata ordering issue
Eino-Ville Talvala [Sat, 22 Aug 2015 00:20:55 +0000 (00:20 +0000)]
am c572dfc4: Camera: Fix spelling of quaternion, fix metadata ordering issue

* commit 'c572dfc4530060fa757f440f215afb57ae9c9c02':
  Camera: Fix spelling of quaternion, fix metadata ordering issue

8 years agoCamera: Fix spelling of quaternion, fix metadata ordering issue
Eino-Ville Talvala [Wed, 19 Aug 2015 23:09:46 +0000 (16:09 -0700)]
Camera: Fix spelling of quaternion, fix metadata ordering issue

The cloned intrinsicCalibration and radialDistortion were not listed in the
correct location and were not propagated to CTS correctly.

Bug: 20537722
Bug: 23360503
Change-Id: Iedc55ed352dc20b26d3b8e4074379691e225b176

8 years agoam 80f17ac6: Merge "Add USB proxy_get_presentation_position() for timestamps" into...
Glenn Kasten [Fri, 7 Aug 2015 17:07:14 +0000 (17:07 +0000)]
am 80f17ac6: Merge "Add USB proxy_get_presentation_position() for timestamps" into mnc-dev

* commit '80f17ac6e5a03810b3f91d3115adf45c94d8be69':
  Add USB proxy_get_presentation_position() for timestamps

8 years agoam 80f17ac6: Merge "Add USB proxy_get_presentation_position() for timestamps" into...
Glenn Kasten [Fri, 7 Aug 2015 16:47:21 +0000 (16:47 +0000)]
am 80f17ac6: Merge "Add USB proxy_get_presentation_position() for timestamps" into mnc-dev

* commit '80f17ac6e5a03810b3f91d3115adf45c94d8be69':
  Add USB proxy_get_presentation_position() for timestamps

8 years agoMerge "Add USB proxy_get_presentation_position() for timestamps" into mnc-dev
Glenn Kasten [Fri, 7 Aug 2015 16:38:45 +0000 (16:38 +0000)]
Merge "Add USB proxy_get_presentation_position() for timestamps" into mnc-dev

8 years agoAdd USB proxy_get_presentation_position() for timestamps
Andy Hung [Tue, 4 Aug 2015 21:57:50 +0000 (14:57 -0700)]
Add USB proxy_get_presentation_position() for timestamps

Bug: 21196672
Change-Id: I7e5d7434935a15ef6bfc7630e16a7895f5e605d6

8 years agoam cf6443f4: Audio HAL API: add bit for compressed audio
Phil Burk [Wed, 5 Aug 2015 20:13:07 +0000 (20:13 +0000)]
am cf6443f4: Audio HAL API: add bit for compressed audio

* commit 'cf6443f4e67079e2b3c3f7849f49681e856f7f38':
  Audio HAL API: add bit for compressed audio

8 years agoam cf6443f4: Audio HAL API: add bit for compressed audio
Phil Burk [Wed, 5 Aug 2015 19:50:39 +0000 (19:50 +0000)]
am cf6443f4: Audio HAL API: add bit for compressed audio

* commit 'cf6443f4e67079e2b3c3f7849f49681e856f7f38':
  Audio HAL API: add bit for compressed audio

8 years agoAudio HAL API: add bit for compressed audio
Phil Burk [Tue, 4 Aug 2015 18:07:41 +0000 (11:07 -0700)]
Audio HAL API: add bit for compressed audio

Add a bit to tell the HAL that the PCM data is really encoded audio
wrapped in a data burst.
Otherwise the device may try to play the encoded data directly
which will sound like modulated white noise.

Bug: 22576112
Change-Id: I8a68a9cf08b34f231c39e9f63283f868169744c0
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoam 8b6721ca: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
Chien-Yu Chen [Fri, 17 Jul 2015 17:56:11 +0000 (17:56 +0000)]
am 8b6721ca: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev

* commit '8b6721ca77a780e2d88c6299684b454952105481':
  Camera2: Update FAST mode for EE and NR

8 years agoam 8b6721ca: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
Chien-Yu Chen [Fri, 17 Jul 2015 17:14:12 +0000 (17:14 +0000)]
am 8b6721ca: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev

* commit '8b6721ca77a780e2d88c6299684b454952105481':
  Camera2: Update FAST mode for EE and NR

8 years agoMerge "Camera2: Update FAST mode for EE and NR" into mnc-dev
Chien-Yu Chen [Fri, 17 Jul 2015 17:01:21 +0000 (17:01 +0000)]
Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev

8 years agoCamera2: Update FAST mode for EE and NR
Chien-Yu Chen [Tue, 14 Jul 2015 23:33:58 +0000 (16:33 -0700)]
Camera2: Update FAST mode for EE and NR

FAST for EE/NR modes may be the same as OFF for devices
whose EE/NR will slow down the capture rate.

Bug: 22486061
Change-Id: Ie3581b43bd46f7804d2859a5f881d974ab91a260

8 years agoam 570c195f: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
Yin-Chia Yeh [Tue, 14 Jul 2015 23:56:02 +0000 (23:56 +0000)]
am 570c195f: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev

* commit '570c195f9e0caf557f96a046c1655931fea8aa9e':
  Camera: clarify largest JPEG dimension expectation

8 years agoam 570c195f: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
Yin-Chia Yeh [Tue, 14 Jul 2015 23:07:49 +0000 (23:07 +0000)]
am 570c195f: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev

* commit '570c195f9e0caf557f96a046c1655931fea8aa9e':
  Camera: clarify largest JPEG dimension expectation

8 years agoMerge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
Yin-Chia Yeh [Tue, 14 Jul 2015 22:53:02 +0000 (22:53 +0000)]
Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev

8 years agoam ce1319b9: Camera metadata: fix typos.
Andy Huibers [Tue, 14 Jul 2015 16:30:25 +0000 (16:30 +0000)]
am ce1319b9: Camera metadata: fix typos.

* commit 'ce1319b92957d10a210adef9979b6a99166e12a6':
  Camera metadata: fix typos.

8 years agoam ce1319b9: Camera metadata: fix typos.
Andy Huibers [Mon, 13 Jul 2015 07:21:37 +0000 (07:21 +0000)]
am ce1319b9: Camera metadata: fix typos.

* commit 'ce1319b92957d10a210adef9979b6a99166e12a6':
  Camera metadata: fix typos.

8 years agoCamera metadata: fix typos.
Andy Huibers [Sat, 11 Jul 2015 15:36:42 +0000 (08:36 -0700)]
Camera metadata: fix typos.

Bug: 22417740
Change-Id: I8e71aa0dbf77d790c5d267ce2f432ceafdcc7a74

8 years agoam 0627da9d: Merge "audio: fix audio_device_is_digital() function." into mnc-dev
Eric Laurent [Fri, 10 Jul 2015 17:34:10 +0000 (17:34 +0000)]
am 0627da9d: Merge "audio: fix audio_device_is_digital() function." into mnc-dev

* commit '0627da9da820e0ced6c751258b2a5bd6b9488310':
  audio: fix audio_device_is_digital() function.

8 years agoam 0627da9d: Merge "audio: fix audio_device_is_digital() function." into mnc-dev
Eric Laurent [Fri, 10 Jul 2015 17:33:19 +0000 (17:33 +0000)]
am 0627da9d: Merge "audio: fix audio_device_is_digital() function." into mnc-dev

* commit '0627da9da820e0ced6c751258b2a5bd6b9488310':
  audio: fix audio_device_is_digital() function.

8 years agoam f55c1a85: Camera: Update API references for high-speed recording refactor
Eino-Ville Talvala [Fri, 10 Jul 2015 17:00:06 +0000 (17:00 +0000)]
am f55c1a85: Camera: Update API references for high-speed recording refactor

* commit 'f55c1a85012411dd8334eef3dfefea4773433472':
  Camera: Update API references for high-speed recording refactor

8 years agoMerge "audio: fix audio_device_is_digital() function." into mnc-dev
Eric Laurent [Fri, 10 Jul 2015 16:30:17 +0000 (16:30 +0000)]
Merge "audio: fix audio_device_is_digital() function." into mnc-dev

8 years agoam f55c1a85: Camera: Update API references for high-speed recording refactor
Eino-Ville Talvala [Fri, 10 Jul 2015 04:08:50 +0000 (04:08 +0000)]
am f55c1a85: Camera: Update API references for high-speed recording refactor

* commit 'f55c1a85012411dd8334eef3dfefea4773433472':
  Camera: Update API references for high-speed recording refactor

8 years agoaudio: fix audio_device_is_digital() function.
Eric Laurent [Fri, 10 Jul 2015 01:36:54 +0000 (18:36 -0700)]
audio: fix audio_device_is_digital() function.

audio_device_is_digital() was returning true for all input devices.

Bug: 22381136.
Change-Id: I6df4c415934faf6b73200e2a0a12caff02a0c86d

8 years agoCamera: Update API references for high-speed recording refactor
Eino-Ville Talvala [Tue, 30 Jun 2015 20:32:09 +0000 (13:32 -0700)]
Camera: Update API references for high-speed recording refactor

Bug: 21664295
Change-Id: I4fec36b5cacd1d366ebc66b97c7797820a83e538

8 years agoam bdc55b4b: Merge "SPDIFEncoder: EAC3 fixes from NVidia" into mnc-dev
Phil Burk [Thu, 9 Jul 2015 20:22:21 +0000 (20:22 +0000)]
am bdc55b4b: Merge "SPDIFEncoder: EAC3 fixes from NVidia" into mnc-dev

* commit 'bdc55b4b0f337e03dcdbc58db3adc49209d0c3a2':
  SPDIFEncoder: EAC3 fixes from NVidia

8 years agoam bdc55b4b: Merge "SPDIFEncoder: EAC3 fixes from NVidia" into mnc-dev
Phil Burk [Thu, 9 Jul 2015 19:32:52 +0000 (19:32 +0000)]
am bdc55b4b: Merge "SPDIFEncoder: EAC3 fixes from NVidia" into mnc-dev

* commit 'bdc55b4b0f337e03dcdbc58db3adc49209d0c3a2':
  SPDIFEncoder: EAC3 fixes from NVidia