OSDN Git Service

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

9 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

9 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

9 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

9 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

9 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

9 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

9 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.

9 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.

9 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

9 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.

9 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.

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 years agoMerge "SPDIFEncoder: EAC3 fixes from NVidia" into mnc-dev
Phil Burk [Thu, 9 Jul 2015 19:17:56 +0000 (19:17 +0000)]
Merge "SPDIFEncoder: EAC3 fixes from NVidia" into mnc-dev

9 years agoCamera: clarify largest JPEG dimension expectation
Yin-Chia Yeh [Wed, 8 Jul 2015 21:07:39 +0000 (14:07 -0700)]
Camera: clarify largest JPEG dimension expectation

Bug: 22295208
Change-Id: I53dbb75bc05a0367566a0cd70be2a975403176df

9 years agoam d91ea14b: Camera: Enforce ZERO_SHUTTER_LAG mode
Chien-Yu Chen [Wed, 8 Jul 2015 21:31:36 +0000 (21:31 +0000)]
am d91ea14b: Camera: Enforce ZERO_SHUTTER_LAG mode

* commit 'd91ea14b659bb8e386f92c7bf77e9e052ad5b1ae':
  Camera: Enforce ZERO_SHUTTER_LAG mode

9 years agoam d91ea14b: Camera: Enforce ZERO_SHUTTER_LAG mode
Chien-Yu Chen [Wed, 8 Jul 2015 20:47:01 +0000 (20:47 +0000)]
am d91ea14b: Camera: Enforce ZERO_SHUTTER_LAG mode

* commit 'd91ea14b659bb8e386f92c7bf77e9e052ad5b1ae':
  Camera: Enforce ZERO_SHUTTER_LAG mode

9 years agoSPDIFEncoder: EAC3 fixes from NVidia
Phil Burk [Wed, 8 Jul 2015 18:39:07 +0000 (11:39 -0700)]
SPDIFEncoder: EAC3 fixes from NVidia

These fixes were suggested by NVidia
https://android-review.googlesource.com/#/c/158460/1

Bug: 22351015
Change-Id: I4da4885360b191e1835c0f2762efc32f51942d66
Signed-off-by: Phil Burk <philburk@google.com>
9 years agoCamera: Enforce ZERO_SHUTTER_LAG mode
Chien-Yu Chen [Wed, 8 Jul 2015 18:49:38 +0000 (11:49 -0700)]
Camera: Enforce ZERO_SHUTTER_LAG mode

Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.

Bug: 22266686
Change-Id: If62226b495557bcf4b72f579d7fb993d4b30c089

9 years agoam 073e4589: Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
Eino-Ville Talvala [Wed, 8 Jul 2015 01:37:30 +0000 (01:37 +0000)]
am 073e4589: Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement

* commit '073e458991e8b25690fcf8b5848e1e1e3a8a3f5b':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement

9 years agoam 073e4589: Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
Eino-Ville Talvala [Tue, 7 Jul 2015 21:53:14 +0000 (21:53 +0000)]
am 073e4589: Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement

* commit '073e458991e8b25690fcf8b5848e1e1e3a8a3f5b':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement

9 years agoCamera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
Eino-Ville Talvala [Tue, 7 Jul 2015 17:40:59 +0000 (10:40 -0700)]
Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement

This mode splits processing quality based on stream resolution, to
enable ZSL operation where low-resolution (preview/recording) streams
require more processing since they are immediately user-visible, while
the high-resolution intermediate ZSL stream should have minimal/no
processing since it will be reprocessed into final quality when
necessary

Bug: 22266686
Change-Id: Ibf7415712e3fb839fc951a9722baffa7a654575c

9 years agoam 7d27e250: Merge "audio: add definitions for devices connected over IP" into mnc-dev
Eric Laurent [Mon, 6 Jul 2015 23:37:37 +0000 (23:37 +0000)]
am 7d27e250: Merge "audio: add definitions for devices connected over IP" into mnc-dev

* commit '7d27e250568b994bf62f9c5bbdb82b24ea676b7f':
  audio: add definitions for devices connected over IP

9 years agoam 7d27e250: Merge "audio: add definitions for devices connected over IP" into mnc-dev
Eric Laurent [Mon, 6 Jul 2015 22:47:06 +0000 (22:47 +0000)]
am 7d27e250: Merge "audio: add definitions for devices connected over IP" into mnc-dev

* commit '7d27e250568b994bf62f9c5bbdb82b24ea676b7f':
  audio: add definitions for devices connected over IP

9 years agoMerge "audio: add definitions for devices connected over IP" into mnc-dev
Eric Laurent [Mon, 6 Jul 2015 21:47:22 +0000 (21:47 +0000)]
Merge "audio: add definitions for devices connected over IP" into mnc-dev

9 years agoam d29ff8c2: Merge "Camera: Remove FREEFORM cropping requirement from FULL" into...
Eino-Ville Talvala [Mon, 6 Jul 2015 19:18:45 +0000 (19:18 +0000)]
am d29ff8c2: Merge "Camera: Remove FREEFORM cropping requirement from FULL" into mnc-dev

* commit 'd29ff8c26084307d98aeab70d720a7b42de80d12':
  Camera: Remove FREEFORM cropping requirement from FULL

9 years agoaudio: add definitions for devices connected over IP
Eric Laurent [Wed, 1 Jul 2015 00:12:29 +0000 (17:12 -0700)]
audio: add definitions for devices connected over IP

Bug: 22068684.
Change-Id: I9c11f54a1059a887833bd1d04499a39071ae458d

9 years agoam d29ff8c2: Merge "Camera: Remove FREEFORM cropping requirement from FULL" into...
Eino-Ville Talvala [Mon, 6 Jul 2015 18:04:07 +0000 (18:04 +0000)]
am d29ff8c2: Merge "Camera: Remove FREEFORM cropping requirement from FULL" into mnc-dev

* commit 'd29ff8c26084307d98aeab70d720a7b42de80d12':
  Camera: Remove FREEFORM cropping requirement from FULL

9 years agoMerge "Camera: Remove FREEFORM cropping requirement from FULL" into mnc-dev
Eino-Ville Talvala [Mon, 6 Jul 2015 17:51:42 +0000 (17:51 +0000)]
Merge "Camera: Remove FREEFORM cropping requirement from FULL" into mnc-dev

9 years agoam 168249c7: Merge "audio: introduce new audio flags for latency" into mnc-dev
Glenn Kasten [Fri, 3 Jul 2015 00:13:03 +0000 (00:13 +0000)]
am 168249c7: Merge "audio: introduce new audio flags for latency" into mnc-dev

* commit '168249c7681e15b442e737d4bd262e6ec81dcd90':
  audio: introduce new audio flags for latency

9 years agoMerge "audio: introduce new audio flags for latency" into mnc-dev
Glenn Kasten [Thu, 2 Jul 2015 23:52:52 +0000 (23:52 +0000)]
Merge "audio: introduce new audio flags for latency" into mnc-dev

9 years agoaudio: introduce new audio flags for latency
Glenn Kasten [Sat, 20 Jun 2015 00:42:28 +0000 (17:42 -0700)]
audio: introduce new audio flags for latency

Bug: 10546170
Bug: 19230391
Change-Id: I62a8a2e4d5e607fade42d0a36068e8fe4eca5bba

9 years agoam 164563fe: Merge "camera2: Fix ABI for new tags." into mnc-dev
Ruben Brunk [Thu, 2 Jul 2015 00:58:18 +0000 (00:58 +0000)]
am 164563fe: Merge "camera2: Fix ABI for new tags." into mnc-dev

* commit '164563fe0afbb69eb7474fc99b2852680b74f171':
  camera2: Fix ABI for new tags.

9 years agoMerge "camera2: Fix ABI for new tags." into mnc-dev
Ruben Brunk [Wed, 1 Jul 2015 20:00:08 +0000 (20:00 +0000)]
Merge "camera2: Fix ABI for new tags." into mnc-dev

9 years agocamera2: Fix ABI for new tags.
Ruben Brunk [Wed, 1 Jul 2015 18:32:39 +0000 (11:32 -0700)]
camera2: Fix ABI for new tags.

Bug: 22229158
Change-Id: If8dc8524258b59b45e56ce54f451c59b9c7e79e2

9 years agoCamera: Remove FREEFORM cropping requirement from FULL
Eino-Ville Talvala [Tue, 30 Jun 2015 23:33:57 +0000 (16:33 -0700)]
Camera: Remove FREEFORM cropping requirement from FULL

Bug: 22207844
Change-Id: Ie31698dffe17bf9d7b95f931fd0f0ec9593ac35a

9 years agoam 07fba884: Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev
Chien-Yu Chen [Fri, 26 Jun 2015 22:38:04 +0000 (22:38 +0000)]
am 07fba884: Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev

* commit '07fba8848de01c7b811eae76b813865dac21cd36':
  Camera2: Remove references to sync.frameNumber

9 years agoMerge "Camera2: Remove references to sync.frameNumber" into mnc-dev
Chien-Yu Chen [Fri, 26 Jun 2015 22:09:28 +0000 (22:09 +0000)]
Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev

9 years agoam 10077182: Merge "Camera2: Add clarification about simultaneous trigger use" into...
Eino-Ville Talvala [Fri, 26 Jun 2015 20:27:57 +0000 (20:27 +0000)]
am 10077182: Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev

* commit '10077182d926bca7c9bab61f8779a00dcc4416e1':
  Camera2: Add clarification about simultaneous trigger use

9 years agoMerge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev
Eino-Ville Talvala [Fri, 26 Jun 2015 19:53:24 +0000 (19:53 +0000)]
Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev

9 years agoCamera2: Remove references to sync.frameNumber
Chien-Yu Chen [Fri, 26 Jun 2015 18:25:45 +0000 (11:25 -0700)]
Camera2: Remove references to sync.frameNumber

Remove public references to sync.frameNumber because it's
a hidden key.

Bug: 21957397
Change-Id: Id7b1fd25caf6a38948951633fa0a08bc85510772

9 years agoCamera2: Add clarification about simultaneous trigger use
Eino-Ville Talvala [Wed, 24 Jun 2015 22:17:09 +0000 (15:17 -0700)]
Camera2: Add clarification about simultaneous trigger use

Allow triggers to be activated at the same time, and specify
allowed behaviors.

Bug: 21399067
Change-Id: I831ec55fc3739e3f49b0a84bb74f0348edb7103c

9 years agoam 192f620a: Merge "Update HAL notes for pre-correction array dimens." into mnc-dev
Ruben Brunk [Wed, 24 Jun 2015 19:11:05 +0000 (19:11 +0000)]
am 192f620a: Merge "Update HAL notes for pre-correction array dimens." into mnc-dev

* commit '192f620abb673cbc1bf6098d96eae744befe8e60':
  Update HAL notes for pre-correction array dimens.

9 years agoMerge "Update HAL notes for pre-correction array dimens." into mnc-dev
Ruben Brunk [Wed, 24 Jun 2015 18:47:09 +0000 (18:47 +0000)]
Merge "Update HAL notes for pre-correction array dimens." into mnc-dev

9 years agoUpdate HAL notes for pre-correction array dimens.
Ruben Brunk [Tue, 23 Jun 2015 23:41:06 +0000 (16:41 -0700)]
Update HAL notes for pre-correction array dimens.

Bug: 20491394
Change-Id: I0edb71d62091d0c23827e9097b302b2d623c46f1

9 years agoam 5787d987: Merge "camera_metadata: fix typo in high speed metadata" into mnc-dev
Zhijun He [Tue, 23 Jun 2015 21:05:59 +0000 (21:05 +0000)]
am 5787d987: Merge "camera_metadata: fix typo in high speed metadata" into mnc-dev

* commit '5787d987c9681e676b2ac5062504bcf52d81cc6c':
  camera_metadata: fix typo in high speed metadata

9 years agoMerge "camera_metadata: fix typo in high speed metadata" into mnc-dev
Zhijun He [Tue, 23 Jun 2015 18:52:03 +0000 (18:52 +0000)]
Merge "camera_metadata: fix typo in high speed metadata" into mnc-dev

9 years agoam 9e7181f8: Merge "Camera: document expected thumbnail size in capture result" into...
Yin-Chia Yeh [Tue, 23 Jun 2015 18:08:18 +0000 (18:08 +0000)]
am 9e7181f8: Merge "Camera: document expected thumbnail size in capture result" into mnc-dev

* commit '9e7181f88d8a43b23a8e6341d1efb8428e352f72':
  Camera: document expected thumbnail size in capture result