OSDN Git Service

android-x86/system-media.git
8 years agoAdd blocking with optional timeout, and effective buffer size
Glenn Kasten [Mon, 20 Jun 2016 21:41:03 +0000 (14:41 -0700)]
Add blocking with optional timeout, and effective buffer size

Change-Id: I15d133bcbe257e1ee767e9dd155e2b646019d59e

8 years agoAddress earlier code review comments
Glenn Kasten [Mon, 20 Jun 2016 19:04:56 +0000 (12:04 -0700)]
Address earlier code review comments

Change-Id: I4d369ba153676d0990dadf9b1269506607adec7f

8 years agoFix review comments for earlier CL
Glenn Kasten [Fri, 17 Jun 2016 17:53:09 +0000 (10:53 -0700)]
Fix review comments for earlier CL

Change-Id: Ia4a637f5d46f8ef0d7d5cefb953565c091c79df3

8 years agoiovec is offset and length now
Glenn Kasten [Fri, 17 Jun 2016 17:43:34 +0000 (10:43 -0700)]
iovec is offset and length now

Change-Id: I0e6c2186382d600e9e2a60e0347b78de972f0149

8 years agoPull out base class that has no knowledge of frame size or buffer
Glenn Kasten [Fri, 17 Jun 2016 17:28:05 +0000 (10:28 -0700)]
Pull out base class that has no knowledge of frame size or buffer

Change-Id: I0727601faf9766c4ed2d08346f53257c20337fe7

8 years agoAdd multi-reader support
Glenn Kasten [Thu, 16 Jun 2016 00:05:54 +0000 (17:05 -0700)]
Add multi-reader support

At most one reader throttles writer.
All other readers must keep up with writer, or are informed of lost frame count.
Refactor reader, writer, and buffer provider APIs as separate classes.

Change-Id: If2007a4f56d40ac892e899632d261fcfee0ea9e4

8 years agoAdd internal fifo API for obtain/release
Glenn Kasten [Wed, 15 Jun 2016 20:07:31 +0000 (13:07 -0700)]
Add internal fifo API for obtain/release

Change-Id: Ife65218788d709768f0ede1cac144327a82e5f15

8 years agoReplace fifo C API and implementation by C++
Glenn Kasten [Mon, 13 Jun 2016 16:34:57 +0000 (09:34 -0700)]
Replace fifo C API and implementation by C++

Improvements to library:
 - Replace Android atomics by C++ atomics
 - struct -> class
 - init -> constructor, deinit -> destructor
 - Avoid signed arithmetic for security
 - Fix usage in test
 - Add README
 - Improve error recovery by returning a status_t if indices are corrupt
 - Fix bug in diff when assertions enabled
 - Add local indices in preparation for multi-reader and protected pages
 - Add more documentation for internal methods

Improvements to unit test:
 - More error checks
 - Fix double delete of fifoBuffer
 - Support 8-bit wav files
 - Enable assertion checks

Change-Id: I8b391b17084084d8e692765ed210a35aaa0b6747

8 years agoAdd a function to get a \\"closest\\" match to supported channel counts. am: eafa18a241
Paul McLean [Tue, 14 Jun 2016 14:24:26 +0000 (14:24 +0000)]
Add a function to get a \\"closest\\" match to supported channel counts. am: eafa18a241
am: 8e5a5825f7

Change-Id: I3cf25dc335a489eb552d6cd4476a9cb48e92928d

8 years agoAdd a function to get a \"closest\" match to supported channel counts.
Paul McLean [Tue, 14 Jun 2016 14:19:44 +0000 (14:19 +0000)]
Add a function to get a \"closest\" match to supported channel counts.
am: eafa18a241

Change-Id: Ifbc524f90f9a3306759ba9b050bad30204e93bad

8 years agoAdd a function to get a "closest" match to supported channel counts.
Paul McLean [Fri, 10 Jun 2016 17:47:43 +0000 (11:47 -0600)]
Add a function to get a "closest" match to supported channel counts.

Bug: 29154372
Change-Id: I5ac51eb2cb250b42fe638ec96e5dfff9425d67f6

8 years agoRename fifo.c to fifo.cpp
Glenn Kasten [Mon, 13 Jun 2016 16:33:23 +0000 (09:33 -0700)]
Rename fifo.c to fifo.cpp

Change-Id: I4da71224b2af2498fce7bbe4c129100a822f2025

8 years agoMerge \"Merge \\\"Camera: document expected timestamp source\\\" into nyc-dev am...
Yin-Chia Yeh [Tue, 7 Jun 2016 22:42:14 +0000 (22:42 +0000)]
Merge \"Merge \\\"Camera: document expected timestamp source\\\" into nyc-dev am: 8a22c41bf5 am: 62555f7360\" into nyc-mr1-dev-plus-aosp
am: 00ce9c81c2

Change-Id: I4f4a64f99ee6dbf29a7e7769a0552233a5e45b2a

8 years agoMerge \\\"Camera: document expected timestamp source\\\" into nyc-dev am: 8a22c41bf5...
Yin-Chia Yeh [Tue, 7 Jun 2016 22:42:14 +0000 (22:42 +0000)]
Merge \\\"Camera: document expected timestamp source\\\" into nyc-dev am: 8a22c41bf5 am: d7fc7c64c0
am: f5e271baf7

Change-Id: Ia7b07b35184dac998e51e381174d939a46bbc572

8 years agoMerge "Merge \\"Camera: document expected timestamp source\\" into nyc-dev am: 8a22c4...
Android Build Merger (Role) [Tue, 7 Jun 2016 22:39:50 +0000 (22:39 +0000)]
Merge "Merge \\"Camera: document expected timestamp source\\" into nyc-dev am: 8a22c41bf5 am: 62555f7360" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Camera: document expected timestamp source\\" into nyc-dev am: 8a22c41bf5
Yin-Chia Yeh [Tue, 7 Jun 2016 22:39:38 +0000 (22:39 +0000)]
Merge \\"Camera: document expected timestamp source\\" into nyc-dev am: 8a22c41bf5
am: d7fc7c64c0

Change-Id: I1294117e0d102104dc5ee0748af646b265b12bfc

8 years agoMerge \\"Camera: document expected timestamp source\\" into nyc-dev am: 8a22c41bf5
Yin-Chia Yeh [Tue, 7 Jun 2016 22:39:38 +0000 (22:39 +0000)]
Merge \\"Camera: document expected timestamp source\\" into nyc-dev am: 8a22c41bf5
am: 62555f7360

Change-Id: I730051c828125c8aac66410e2cc208f2ccaf8484

8 years agoMerge \"Camera: document expected timestamp source\" into nyc-dev
Yin-Chia Yeh [Tue, 7 Jun 2016 22:37:09 +0000 (22:37 +0000)]
Merge \"Camera: document expected timestamp source\" into nyc-dev
am: 8a22c41bf5

Change-Id: Iad645be722f64d13f58d34cd6aea2554785ee9fc

8 years agoMerge \"Camera: document expected timestamp source\" into nyc-dev
Yin-Chia Yeh [Tue, 7 Jun 2016 22:37:09 +0000 (22:37 +0000)]
Merge \"Camera: document expected timestamp source\" into nyc-dev
am: 8a22c41bf5

Change-Id: Iebce5b3330a010356892b68ed22b82e100fe9012

8 years agoMerge "Camera: document expected timestamp source" into nyc-dev
Yin-Chia Yeh [Tue, 7 Jun 2016 22:30:06 +0000 (22:30 +0000)]
Merge "Camera: document expected timestamp source" into nyc-dev

8 years agoCamera: document expected timestamp source
Yin-Chia Yeh [Mon, 6 Jun 2016 21:25:11 +0000 (14:25 -0700)]
Camera: document expected timestamp source

Bug: 29120073
Change-Id: Ia7aef33aaa0b05499e134f261b60d6a9969865e2

8 years agoMerge "Camera: Update lensShadingMap documentation and visibility am: d089ee6902...
Eino-Ville Talvala [Fri, 3 Jun 2016 18:32:56 +0000 (18:32 +0000)]
Merge "Camera: Update lensShadingMap documentation and visibility am: d089ee6902 am: 64a7a89d28" into nyc-mr1-dev-plus-aosp
am: 7540c85a97

* commit '7540c85a977685647eba77a1c58fece62fd21faa':

Change-Id: Ic50966c6b5121b22d3bf042f7f92ce2e8ebebfd0

8 years agoCamera: Update lensShadingMap documentation and visibility am: d089ee6902 am: 235c7c9d82
Eino-Ville Talvala [Fri, 3 Jun 2016 18:17:48 +0000 (18:17 +0000)]
Camera: Update lensShadingMap documentation and visibility am: d089ee6902 am: 235c7c9d82
am: aca2759c93

* commit 'aca2759c93788b591c7f50a3ea06c580bd5dbaa4':
  Camera: Update lensShadingMap documentation and visibility

Change-Id: Ibf8cfe8c6a5770059fc847d8472a8012814c9fc9

8 years agoMerge "Camera: Update lensShadingMap documentation and visibility am: d089ee6902...
Android Build Merger (Role) [Fri, 3 Jun 2016 18:12:44 +0000 (18:12 +0000)]
Merge "Camera: Update lensShadingMap documentation and visibility am: d089ee6902 am: 64a7a89d28" into nyc-mr1-dev-plus-aosp

8 years agoCamera: Update lensShadingMap documentation and visibility am: d089ee6902
Eino-Ville Talvala [Fri, 3 Jun 2016 18:10:15 +0000 (18:10 +0000)]
Camera: Update lensShadingMap documentation and visibility am: d089ee6902
am: 64a7a89d28

* commit '64a7a89d286a263af5565da947819ce64162c977':
  Camera: Update lensShadingMap documentation and visibility

Change-Id: I507bf8c8cfc599f74e6540f3f7753b72caf99f0d

8 years agoCamera: Update lensShadingMap documentation and visibility am: d089ee6902
Eino-Ville Talvala [Fri, 3 Jun 2016 18:09:38 +0000 (18:09 +0000)]
Camera: Update lensShadingMap documentation and visibility am: d089ee6902
am: 235c7c9d82

* commit '235c7c9d82549f945a12e1d79c8da10e69dadbb2':
  Camera: Update lensShadingMap documentation and visibility

Change-Id: I5f1dde2fbd8cdb949e58ad7ea86acf5394c612af

8 years agoCamera: Update lensShadingMap documentation and visibility
Eino-Ville Talvala [Fri, 3 Jun 2016 18:02:01 +0000 (18:02 +0000)]
Camera: Update lensShadingMap documentation and visibility
am: d089ee6902

* commit 'd089ee6902fe06695c119368e05339f6ea2ad402':
  Camera: Update lensShadingMap documentation and visibility

Change-Id: Ie83fd7a2cb1b20e6bf809128eb18f7faea706d1f

8 years agoCamera: Update lensShadingMap documentation and visibility
Eino-Ville Talvala [Fri, 3 Jun 2016 17:57:40 +0000 (17:57 +0000)]
Camera: Update lensShadingMap documentation and visibility
am: d089ee6902

* commit 'd089ee6902fe06695c119368e05339f6ea2ad402':
  Camera: Update lensShadingMap documentation and visibility

Change-Id: I44d0178be4fb7307d53dada3f00bcea526df9142

8 years agoCamera: Update lensShadingMap documentation and visibility
Eino-Ville Talvala [Thu, 2 Jun 2016 21:15:56 +0000 (14:15 -0700)]
Camera: Update lensShadingMap documentation and visibility

Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to
camera device-processed data.

Remove the Java lens shading map key from the NDK, since it's a
duplicate of the underlying native key already in NDK.

Also fix a few other wording issues in the lens shading documentation.

Bug: 18175853
Change-Id: I227707671914eb17b0a0dd14655ea732aae2a6b7

8 years agoMerge "Camera: update NDK metadata tag documents am: c9c2c6849c am: a92f6c639f" into...
Yin-Chia Yeh [Thu, 2 Jun 2016 18:23:37 +0000 (18:23 +0000)]
Merge "Camera: update NDK metadata tag documents am: c9c2c6849c am: a92f6c639f" into nyc-mr1-dev-plus-aosp
am: 9a1ab44b56

* commit '9a1ab44b563b1ed34fbb354dfc6aad87d016417b':

Change-Id: I7ba9b77cc50132455defcaf9bbd9fc8367cd0d74

8 years agoCamera: update NDK metadata tag documents am: c9c2c6849c am: 68d560edf1
Yin-Chia Yeh [Thu, 2 Jun 2016 18:23:18 +0000 (18:23 +0000)]
Camera: update NDK metadata tag documents am: c9c2c6849c am: 68d560edf1
am: 56c26cf9d1

* commit '56c26cf9d1309758ff78604aec958f745a83e9e2':
  Camera: update NDK metadata tag documents

Change-Id: Id1cdff8afe1d41e3da2ad8cb51672e17dc8598ad

8 years agoMerge "Camera: update NDK metadata tag documents am: c9c2c6849c am: a92f6c639f" into...
Android Build Merger (Role) [Thu, 2 Jun 2016 18:21:20 +0000 (18:21 +0000)]
Merge "Camera: update NDK metadata tag documents am: c9c2c6849c am: a92f6c639f" into nyc-mr1-dev-plus-aosp

8 years agoCamera: update NDK metadata tag documents am: c9c2c6849c
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:35 +0000 (18:20 +0000)]
Camera: update NDK metadata tag documents am: c9c2c6849c
am: a92f6c639f

* commit 'a92f6c639f06db39fcce5f635433e7bc4f36ff99':
  Camera: update NDK metadata tag documents

Change-Id: I2e7825d8c9e704664b4605ce842f6c68ab820cf1

8 years agoCamera: update NDK metadata tag documents am: c9c2c6849c
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:33 +0000 (18:20 +0000)]
Camera: update NDK metadata tag documents am: c9c2c6849c
am: 68d560edf1

* commit '68d560edf1c81e04ae83caa64614553f477d9583':
  Camera: update NDK metadata tag documents

Change-Id: I97f548a8478208bff8b04b72daf65b2d11b8b61e

8 years agoCamera: update NDK metadata tag documents
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:43 +0000 (18:17 +0000)]
Camera: update NDK metadata tag documents
am: c9c2c6849c

* commit 'c9c2c6849c68ddb458d63b5f864ea76a8448a3d2':
  Camera: update NDK metadata tag documents

Change-Id: I6aea7ab4dc20a26b43ca1df5b513731ecf4ff154

8 years agoCamera: update NDK metadata tag documents
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:42 +0000 (18:17 +0000)]
Camera: update NDK metadata tag documents
am: c9c2c6849c

* commit 'c9c2c6849c68ddb458d63b5f864ea76a8448a3d2':
  Camera: update NDK metadata tag documents

Change-Id: I53ecb5decb20d735076684bc2a6bee23a20e0c8b

8 years agoAdd dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL am: 21b04ade57
Paul McLean [Thu, 2 Jun 2016 16:05:23 +0000 (16:05 +0000)]
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL am: 21b04ade57
am: 0f5d0add8c

* commit '0f5d0add8c5a69865fda6242c6efbbf0da84ab23':
  Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL

Change-Id: Idbae8d1da200e6df70c096bb54cfb7ebbf577361

8 years agoAdd dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
Paul McLean [Thu, 2 Jun 2016 16:01:42 +0000 (16:01 +0000)]
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
am: 21b04ade57

* commit '21b04ade57e5cbf33eff11f3f400f77eed5e2e75':
  Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL

Change-Id: Iced9c23f7a6743c2766d3a18032421d782722b46

8 years agoRevert "Adding dump functions to report state in dumpsys media.audio_flinger" am...
Paul Mclean [Thu, 2 Jun 2016 15:30:36 +0000 (15:30 +0000)]
Revert "Adding dump functions to report state in dumpsys media.audio_flinger" am: 2a3925e95a
am: 14dae2024f

* commit '14dae2024f7263beed5ce7167ac386eacc582104':
  Revert "Adding dump functions to report state in dumpsys media.audio_flinger"

Change-Id: I7dcbdf4f50d3e0313df5eb03224e215b2d752abe

8 years agoRevert "Adding dump functions to report state in dumpsys media.audio_flinger"
Paul Mclean [Thu, 2 Jun 2016 15:24:04 +0000 (15:24 +0000)]
Revert "Adding dump functions to report state in dumpsys media.audio_flinger"
am: 2a3925e95a

* commit '2a3925e95a9d4954be789dc4594233d4cc2d251c':
  Revert "Adding dump functions to report state in dumpsys media.audio_flinger"

Change-Id: I85b3764111a005b117ccd569b808124adfe71907

8 years agoAdd dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
Paul McLean [Wed, 25 May 2016 20:07:00 +0000 (14:07 -0600)]
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL

Bug: 28960293

Change-Id: Ice8a72b77ba00a816d12d2028b4ea5e7fe4bd319

8 years agoRevert "Adding dump functions to report state in dumpsys media.audio_flinger"
Paul Mclean [Thu, 2 Jun 2016 14:48:10 +0000 (14:48 +0000)]
Revert "Adding dump functions to report state in dumpsys media.audio_flinger"

This reverts commit b776eb3998732bc0278cce84c0ecfd1d91d5874f.

Change-Id: I7c0806abe5052afb46ca96d506cc5cadc79ee5fe

8 years agoCamera: update NDK metadata tag documents
Yin-Chia Yeh [Wed, 25 May 2016 08:29:55 +0000 (01:29 -0700)]
Camera: update NDK metadata tag documents

- Create a separate ndk_metadata_properties.xml to convert java
  API specific documents to NDK specific.
- Replace link to public SDK by NDK counterparts or hyperlink
  to public SDK website.
- Disable markdown->html rendering on tables because doxygen
  supports markdown syntax and does not support thead/tbody tag.
- Add descriptions to rectangle keys to specify their data
  representation is (left, top, width, height)

Bug: 27102995
Change-Id: I6b6da019dde66f28fce72937f05bd984638ec2ba

8 years agoAdding dump functions to report state in dumpsys media.audio_flinger am: b776eb3998
Paul McLean [Tue, 31 May 2016 20:53:12 +0000 (20:53 +0000)]
Adding dump functions to report state in dumpsys media.audio_flinger am: b776eb3998
am: c8d061b185

* commit 'c8d061b1859700008290e333da2ab5e892e5c23b':
  Adding dump functions to report state in dumpsys media.audio_flinger

Change-Id: Id255fb1ef1d761afccd61204cd2590723e454e32

8 years agoMerge "Revert "Add dump() (i.e dumpsys media.audio_flinger) functionality to USB...
Paul Mclean [Tue, 31 May 2016 20:52:03 +0000 (20:52 +0000)]
Merge "Revert "Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL""

8 years agoRevert "Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL"
Paul Mclean [Tue, 31 May 2016 20:49:14 +0000 (20:49 +0000)]
Revert "Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL"

This reverts commit 975806d761330577e7d19b26f6345601951286d2.

Change-Id: I265611c9c957826fc2cfd6fdaab84cf8212f94b8

8 years agoAdding dump functions to report state in dumpsys media.audio_flinger
Paul McLean [Tue, 31 May 2016 19:42:01 +0000 (19:42 +0000)]
Adding dump functions to report state in dumpsys media.audio_flinger
am: b776eb3998

* commit 'b776eb3998732bc0278cce84c0ecfd1d91d5874f':
  Adding dump functions to report state in dumpsys media.audio_flinger

Change-Id: Icb859bf4048ed4a122f6c60ce40c34f0f75b5562

8 years agoAdding dump functions to report state in dumpsys media.audio_flinger
Paul McLean [Wed, 11 May 2016 22:48:57 +0000 (16:48 -0600)]
Adding dump functions to report state in dumpsys media.audio_flinger

Change-Id: Icca1d817d56086f61290fc0a46aacd0c577752df

8 years agoMerge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a am: 7fffdc5b8b...
Luis Hector Chavez [Sat, 28 May 2016 00:41:58 +0000 (00:41 +0000)]
Merge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a am: 7fffdc5b8b am: d792635ff5
am: 04354ca63f

* commit '04354ca63f8db134f7e2cde84b92d42fa7d7143c':
  audioservice: Update libchrome APIs to r395517

Change-Id: Idf21c2c551842bf9a6711761609a2e506c7448ec

8 years agoMerge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a am: 7fffdc5b8b
Luis Hector Chavez [Sat, 28 May 2016 00:07:23 +0000 (00:07 +0000)]
Merge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a am: 7fffdc5b8b
am: d792635ff5

* commit 'd792635ff5a59b1b8a1f54e09ecc39a50269b2e2':
  audioservice: Update libchrome APIs to r395517

Change-Id: I5be4cd8dd378d71a759612f7ea453694aeddfc72

8 years agoMerge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a
Luis Hector Chavez [Fri, 27 May 2016 23:55:42 +0000 (23:55 +0000)]
Merge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a
am: 7fffdc5b8b

* commit '7fffdc5b8bc9f22259e4eb0e95a66262a0facb3b':
  audioservice: Update libchrome APIs to r395517

Change-Id: Id2d7ec727a1dbc0e412b55f26110cd82757bc3b4

8 years agoMerge "audioservice: Update libchrome APIs to r395517"
Luis Hector Chavez [Fri, 27 May 2016 23:53:06 +0000 (23:53 +0000)]
Merge "audioservice: Update libchrome APIs to r395517"
am: 9b127ae22a

* commit '9b127ae22ae21c2255981a55dd3ca538df7eb0e9':
  audioservice: Update libchrome APIs to r395517

Change-Id: I3fb36ba147624b2e875977029ee30b1758b88fbf

8 years agoMerge "audioservice: Update libchrome APIs to r395517"
Treehugger Robot [Fri, 27 May 2016 23:43:02 +0000 (23:43 +0000)]
Merge "audioservice: Update libchrome APIs to r395517"

8 years agoaudioservice: Update libchrome APIs to r395517
Luis Hector Chavez [Sat, 21 May 2016 06:13:13 +0000 (23:13 -0700)]
audioservice: Update libchrome APIs to r395517

The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.

Change-Id: I8b1d18cd044009fd7a5889432296de159dc57edd

8 years agoAdd dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
Paul McLean [Wed, 25 May 2016 20:07:00 +0000 (14:07 -0600)]
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL

Bug: 28960293

Change-Id: Ice8a72b77ba00a816d12d2028b4ea5e7fe4bd319

8 years agoMerge "__ARM_ARCH__ is always >= 6." am: 236049f1b6 am: 1189f6f678 am: ff4f9af68b
Elliott Hughes [Wed, 18 May 2016 15:44:55 +0000 (15:44 +0000)]
Merge "__ARM_ARCH__ is always >= 6." am: 236049f1b6 am: 1189f6f678 am: ff4f9af68b
am: 482510acb8

* commit '482510acb8c5336d42437318a375ec01188e9ea0':
  __ARM_ARCH__ is always >= 6.

Change-Id: I96d9c2a0fb1b192b60db2d67b36b3188f60549ac

8 years agoMerge "__ARM_ARCH__ is always >= 6." am: 236049f1b6 am: 1189f6f678
Elliott Hughes [Wed, 18 May 2016 15:40:09 +0000 (15:40 +0000)]
Merge "__ARM_ARCH__ is always >= 6." am: 236049f1b6 am: 1189f6f678
am: ff4f9af68b

* commit 'ff4f9af68b0c1a770bed813e14444c6f2abeac75':
  __ARM_ARCH__ is always >= 6.

Change-Id: Ia7d9ad174c3ff14c150a13393eaf7b262453d7c5

8 years agoMerge "__ARM_ARCH__ is always >= 6." am: 236049f1b6
Elliott Hughes [Wed, 18 May 2016 15:34:44 +0000 (15:34 +0000)]
Merge "__ARM_ARCH__ is always >= 6." am: 236049f1b6
am: 1189f6f678

* commit '1189f6f6788a5cb97f13c5ae7166dc802343c440':
  __ARM_ARCH__ is always >= 6.

Change-Id: I6bb088ce56819a17b4ffa3c7925ac8ccc229368b

8 years agoMerge "__ARM_ARCH__ is always >= 6."
Elliott Hughes [Wed, 18 May 2016 15:31:07 +0000 (15:31 +0000)]
Merge "__ARM_ARCH__ is always >= 6."
am: 236049f1b6

* commit '236049f1b6a05fa31ccca01c64c6ccc81d61bdb1':
  __ARM_ARCH__ is always >= 6.

Change-Id: Ia8439dbe6fd02f966aa9430e30b07cb6416e4b20

8 years agoMerge "__ARM_ARCH__ is always >= 6."
Elliott Hughes [Wed, 18 May 2016 15:19:40 +0000 (15:19 +0000)]
Merge "__ARM_ARCH__ is always >= 6."

8 years ago__ARM_ARCH__ is always >= 6.
Elliott Hughes [Tue, 17 May 2016 19:38:58 +0000 (12:38 -0700)]
__ARM_ARCH__ is always >= 6.

Bug: http://b/18556103
Change-Id: Ib0945132f4d0c662dd3eebea91e0a781485e86ce

8 years agoMerge "Fix misc-macro-parentheses warnings." am: 73e30a2584 am: 94a926bedb am: d8deff7455
Chih-hung Hsieh [Mon, 16 May 2016 18:31:21 +0000 (18:31 +0000)]
Merge "Fix misc-macro-parentheses warnings." am: 73e30a2584 am: 94a926bedb am: d8deff7455
am: 965b4d0bc0

* commit '965b4d0bc0a8ad8d14f090af3c8417de408e37e7':
  Fix misc-macro-parentheses warnings.

Change-Id: If64f5aa49cb97de13cbb3319f9667cb04ba114cd

8 years agoMerge "Fix misc-macro-parentheses warnings." am: 73e30a2584 am: 94a926bedb
Chih-Hung Hsieh [Mon, 16 May 2016 18:28:32 +0000 (18:28 +0000)]
Merge "Fix misc-macro-parentheses warnings." am: 73e30a2584 am: 94a926bedb
am: d8deff7455

* commit 'd8deff7455ffa50c249b514c6c65b9c9e6150c36':
  Fix misc-macro-parentheses warnings.

Change-Id: Iae3792004cac72e7bb0c8ed1d352a725207167bd

8 years agoMerge "Fix misc-macro-parentheses warnings." am: 73e30a2584
Chih-hung Hsieh [Mon, 16 May 2016 18:26:16 +0000 (18:26 +0000)]
Merge "Fix misc-macro-parentheses warnings." am: 73e30a2584
am: 94a926bedb

* commit '94a926bedb5cd239bacec0e4ae32f97073600d3c':
  Fix misc-macro-parentheses warnings.

Change-Id: If1524cbe5832eb2be931d8d1e02ce452acd54028

8 years agoMerge "Fix misc-macro-parentheses warnings."
Chih-Hung Hsieh [Mon, 16 May 2016 18:24:00 +0000 (18:24 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am: 73e30a2584

* commit '73e30a2584522a45c00e9c497b4b2dd1eb3a8474':
  Fix misc-macro-parentheses warnings.

Change-Id: Ibf95e3930b36d205c99f631033792124d8f715df

8 years agoMerge "Fix misc-macro-parentheses warnings."
Chih-hung Hsieh [Mon, 16 May 2016 18:20:07 +0000 (18:20 +0000)]
Merge "Fix misc-macro-parentheses warnings."

8 years agoCamera: update ndk metadata tag template am: 1d3e1a7583 am: e5f2b859e0
Yin-Chia Yeh [Thu, 12 May 2016 19:39:47 +0000 (19:39 +0000)]
Camera: update ndk metadata tag template am: 1d3e1a7583 am: e5f2b859e0
am: 47be56ec74

* commit '47be56ec74a9cc0f17aa7b49c244d5e75f905c8c':

Change-Id: I882d7b04cdebc4892d0cefcdf9b8c07b630e8c55

8 years agoCamera: update ndk metadata tag template am: 1d3e1a7583 am: c5829034b5
Yin-Chia Yeh [Thu, 12 May 2016 19:39:44 +0000 (19:39 +0000)]
Camera: update ndk metadata tag template am: 1d3e1a7583 am: c5829034b5
am: ec1f4e3785

* commit 'ec1f4e37853c25e5d76842a63577dacf7cdc4a24':
  Camera: update ndk metadata tag template

Change-Id: I82fb985522d6cbe73d654ee36a1bfef4d283053a

8 years agoCamera: update ndk metadata tag template am: 1d3e1a7583
Yin-Chia Yeh [Thu, 12 May 2016 19:39:17 +0000 (19:39 +0000)]
Camera: update ndk metadata tag template am: 1d3e1a7583
am: e5f2b859e0

* commit 'e5f2b859e0ef92ec2a485c07b743e376db58b859':

Change-Id: Ifa040987b463cd4d09b85fef0fa9c34d0dc9d7cd

8 years agoCamera: update ndk metadata tag template am: 1d3e1a7583
Yin-Chia Yeh [Thu, 12 May 2016 19:37:08 +0000 (19:37 +0000)]
Camera: update ndk metadata tag template am: 1d3e1a7583
am: c5829034b5

* commit 'c5829034b584d7dfb675c2430b4e8da92e7a9bc0':
  Camera: update ndk metadata tag template

Change-Id: Id9b28e71ca9f18bdb9673ab438698c758d3887b1

8 years agoCamera: update ndk metadata tag template
Yin-Chia Yeh [Thu, 12 May 2016 19:34:32 +0000 (19:34 +0000)]
Camera: update ndk metadata tag template
am: 1d3e1a7583

* commit '1d3e1a75837712a7c8953feabf6af9eec84dd296':
  Camera: update ndk metadata tag template

Change-Id: Id9ce584bc372dba72c025c781a64e1c7679a9fcf

8 years agoCamera: update ndk metadata tag template
Yin-Chia Yeh [Thu, 12 May 2016 19:34:23 +0000 (19:34 +0000)]
Camera: update ndk metadata tag template
am: 1d3e1a7583

* commit '1d3e1a75837712a7c8953feabf6af9eec84dd296':
  Camera: update ndk metadata tag template

Change-Id: I235ad26c99c1d147f74d50eed0c4af7f41cd3f74

8 years agoFix misc-macro-parentheses warnings.
Chih-Hung Hsieh [Wed, 11 May 2016 22:13:31 +0000 (15:13 -0700)]
Fix misc-macro-parentheses warnings.

Add parentheses around macro arguments used beside binary operators.

Bug: 28705665
Change-Id: Idccb673b6ffacb4c25980ac74b60f3d5d6c2b56f

8 years agoCamera: update ndk metadata tag template
Yin-Chia Yeh [Tue, 10 May 2016 22:03:21 +0000 (15:03 -0700)]
Camera: update ndk metadata tag template

to add doxygen tags.

Bug: 27102995
Change-Id: Id73b43124e1df84c408189b472082f8ef3d6873f

8 years agoMerge changes Ia78f608c,I14dde521 am: 17b3b82b64 am: 48b84f79e8 am: 623f460bbf
Ralph Nathan [Mon, 9 May 2016 19:59:14 +0000 (19:59 +0000)]
Merge changes Ia78f608c,I14dde521 am: 17b3b82b64 am: 48b84f79e8 am: 623f460bbf
am: 04c4c1aed2

* commit '04c4c1aed251181307c1d7e401c4dc62775b2723':
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

Change-Id: I51b99430aca8a3c144f454a89ff99fa491024343

8 years agoMerge changes Ia78f608c,I14dde521 am: 17b3b82b64 am: 48b84f79e8
Ralph Nathan [Mon, 9 May 2016 19:53:52 +0000 (19:53 +0000)]
Merge changes Ia78f608c,I14dde521 am: 17b3b82b64 am: 48b84f79e8
am: 623f460bbf

* commit '623f460bbfcc453ab6b74029b9d119bc56535635':
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

Change-Id: I8d0d76fd11d59c91bd37a2e1f89a647d79cbb725

8 years agoMerge changes Ia78f608c,I14dde521 am: 17b3b82b64
Ralph Nathan [Mon, 9 May 2016 19:48:25 +0000 (19:48 +0000)]
Merge changes Ia78f608c,I14dde521 am: 17b3b82b64
am: 48b84f79e8

* commit '48b84f79e85dc0c9a293f4fe051177e935890d0c':
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

Change-Id: I10e642a8e7c00dbb208deee609e8652b35ce1347

8 years agoMerge changes Ia78f608c,I14dde521
Ralph Nathan [Mon, 9 May 2016 19:43:00 +0000 (19:43 +0000)]
Merge changes Ia78f608c,I14dde521
am: 17b3b82b64

* commit '17b3b82b64aa780d4cae8e4104823307e8a512a4':
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

Change-Id: Ia3316a9aa31dde509b9a086f6da0dd527d3a20e4

8 years agoMerge changes Ia78f608c,I14dde521
Ralph Nathan [Mon, 9 May 2016 19:34:51 +0000 (19:34 +0000)]
Merge changes Ia78f608c,I14dde521

* changes:
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

8 years agoMerge "Stop hard coding gtest include path." am: b7b0a8a5b4 am: 39ed48636e am: dca043749d
Dan Albert [Sat, 7 May 2016 00:46:53 +0000 (00:46 +0000)]
Merge "Stop hard coding gtest include path." am: b7b0a8a5b4 am: 39ed48636e am: dca043749d
am: 7984568e1d

* commit '7984568e1dde23e4ca178fdd62a95adf4b9ac8f8':
  Stop hard coding gtest include path.

Change-Id: I7d0acf17703584ba7e4fbea7aea8a9dc0bd4a34e

8 years agoMerge "Stop hard coding gtest include path." am: b7b0a8a5b4 am: 39ed48636e
Dan Albert [Sat, 7 May 2016 00:41:28 +0000 (00:41 +0000)]
Merge "Stop hard coding gtest include path." am: b7b0a8a5b4 am: 39ed48636e
am: dca043749d

* commit 'dca043749dac2516f3d16e88db07e430168046bc':
  Stop hard coding gtest include path.

Change-Id: I5c703f7653539a79d011b8550e5e3bf1b6ba847e

8 years agoMerge "Stop hard coding gtest include path." am: b7b0a8a5b4
Dan Albert [Sat, 7 May 2016 00:36:22 +0000 (00:36 +0000)]
Merge "Stop hard coding gtest include path." am: b7b0a8a5b4
am: 39ed48636e

* commit '39ed48636ed58a0607c0702dd62b2945b7c354c3':
  Stop hard coding gtest include path.

Change-Id: Idd9bdfd838dd09408f9e28fe7167119269c590b0

8 years agoMerge "Stop hard coding gtest include path."
Dan Albert [Sat, 7 May 2016 00:31:34 +0000 (00:31 +0000)]
Merge "Stop hard coding gtest include path."
am: b7b0a8a5b4

* commit 'b7b0a8a5b4fa07655846a167e5f93cb2c2118f30':
  Stop hard coding gtest include path.

Change-Id: I7bbcda326f0d621dc21a216884e64291a63aa9e3

8 years agoMerge "Stop hard coding gtest include path."
Treehugger Robot [Sat, 7 May 2016 00:25:48 +0000 (00:25 +0000)]
Merge "Stop hard coding gtest include path."

8 years agoStop hard coding gtest include path.
Dan Albert [Thu, 3 Mar 2016 21:01:15 +0000 (13:01 -0800)]
Stop hard coding gtest include path.

BUILD_NATIVE_TEST handles gtest includes for you.

Bug: http://b/16574165
Change-Id: Idfb9080612ac69a0e00d8108bb2ff9a0aa8135c4

8 years agoCamera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4e3f am: 025821c016
Yin-Chia Yeh [Thu, 28 Apr 2016 19:54:16 +0000 (19:54 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4e3f am: 025821c016
am: 8dfa31549d

* commit '8dfa31549d8018cdeb1eaa9dd4cbc94cb49185f9':

Change-Id: I30850d6031a8a02c87c31c24eb142058530eb688

8 years agoCamera: Documentation updates am: 62cfd97 am: 58b8e6e am: bf61f8aaaf am: ca4628566d
Eino-Ville Talvala [Thu, 28 Apr 2016 19:54:16 +0000 (19:54 +0000)]
Camera: Documentation updates am: 62cfd97 am: 58b8e6e am: bf61f8aaaf am: ca4628566d
am: 6c2f642b7d

* commit '6c2f642b7d77914445cdf35cd9ad11388f4eed89':

Change-Id: I9a69b1b3b093b758e741eca5f9a533670814ab50

8 years agoCamera: update video stabilization API doc. am: 161c29c am: 569abce am: 3c770fa86d...
Jianing Wei [Thu, 28 Apr 2016 19:54:15 +0000 (19:54 +0000)]
Camera: update video stabilization API doc. am: 161c29c am: 569abce am: 3c770fa86d am: 24c17eebaf
am: ba4530d759

* commit 'ba4530d75918c446642526624ad5a148d11ed392':

Change-Id: I574d7a43ea8f7e2ab7c64cd417fb7ca63940415b

8 years agoCamera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4 am: ae241bdeb4
Yin-Chia Yeh [Thu, 28 Apr 2016 19:54:14 +0000 (19:54 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4 am: ae241bdeb4
am: 66764d2cec

* commit '66764d2cec97a428d50d4862775846caab169969':
  Camera: update FPS range spec

Change-Id: Id97db217be7219d37d6040a10f4e37c927517512

8 years agoCamera: Documentation updates am: 62cfd97 am: 58b8e6e am: bf61f8a am: 26f5780f93
Eino-Ville Talvala [Thu, 28 Apr 2016 19:54:13 +0000 (19:54 +0000)]
Camera: Documentation updates am: 62cfd97 am: 58b8e6e am: bf61f8a am: 26f5780f93
am: 7f0c3d6d4a

* commit '7f0c3d6d4aa6cd4ea9281ed8f3765bfab6ddcff4':
  Camera: Documentation updates

Change-Id: Iab07fe9c41360a0b828737a766702bccdff5ced5

8 years agoCamera: update video stabilization API doc. am: 161c29c am: 569abce am: 3c770fa am...
Jianing Wei [Thu, 28 Apr 2016 19:54:13 +0000 (19:54 +0000)]
Camera: update video stabilization API doc. am: 161c29c am: 569abce am: 3c770fa am: 3bd8da1e10
am: 722a680c32

* commit '722a680c32a01193dfcfc549babfc82f4c80058f':
  Camera: update video stabilization API doc.

Change-Id: Ib5ba4a1ab891a7ea0d281ac001a1e9104106acd2

8 years agoCamera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4e3f
Yin-Chia Yeh [Thu, 28 Apr 2016 19:37:55 +0000 (19:37 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4e3f
am: 025821c016

* commit '025821c0167997ae0bad56431d23074eec2c98cf':

Change-Id: Ia84b2ef35ec74c093bf08f3b4bbf252aa168b404

8 years agoCamera: Documentation updates am: 62cfd97 am: 58b8e6e am: bf61f8aaaf
Eino-Ville Talvala [Thu, 28 Apr 2016 19:37:54 +0000 (19:37 +0000)]
Camera: Documentation updates am: 62cfd97 am: 58b8e6e am: bf61f8aaaf
am: ca4628566d

* commit 'ca4628566d69073028e2783a16e6cd7ba8ae663d':

Change-Id: I120b496b1f44e8b186a4fa9bd2df1517f93bf4e3

8 years agoCamera: update video stabilization API doc. am: 161c29c am: 569abce am: 3c770fa86d
Jianing Wei [Thu, 28 Apr 2016 19:37:52 +0000 (19:37 +0000)]
Camera: update video stabilization API doc. am: 161c29c am: 569abce am: 3c770fa86d
am: 24c17eebaf

* commit '24c17eebaf76818f3f88f9901dbefa59389c0818':

Change-Id: I4bb003ce527d04af77eef222532ed85d944e3741

8 years agoCamera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4
Yin-Chia Yeh [Thu, 28 Apr 2016 19:33:30 +0000 (19:33 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4
am: ae241bdeb4

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

Change-Id: I9f9be85d3405f45e19dbceb3ad28cae24d230bc4

8 years agoCamera: Documentation updates am: 62cfd97 am: 58b8e6e am: bf61f8a
Eino-Ville Talvala [Thu, 28 Apr 2016 19:33:29 +0000 (19:33 +0000)]
Camera: Documentation updates am: 62cfd97 am: 58b8e6e am: bf61f8a
am: 26f5780f93

* commit '26f5780f93ba47886034c68cef5a8c50aa67d6f3':
  Camera: Documentation updates

Change-Id: I52b5ab4b3d9ff2831f469cac9e64911d4686e3b1

8 years agoCamera: update video stabilization API doc. am: 161c29c am: 569abce am: 3c770fa
Jianing Wei [Thu, 28 Apr 2016 19:33:28 +0000 (19:33 +0000)]
Camera: update video stabilization API doc. am: 161c29c am: 569abce am: 3c770fa
am: 3bd8da1e10

* commit '3bd8da1e10cc51fd853361a74f1e4992beaaa8df':
  Camera: update video stabilization API doc.

Change-Id: I1e58788f64112558afe462b6a2e46f9531f576c2

8 years agoCamera: update FPS range spec am: 206bf4d am: 386195f
Yin-Chia Yeh [Thu, 28 Apr 2016 19:29:46 +0000 (19:29 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f
am: ea549f4e3f

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

Change-Id: I5a8e91a71b8ac4d0ea3370fa5193de3de08d42c1

8 years agoCamera: Documentation updates am: 62cfd97 am: 58b8e6e
Eino-Ville Talvala [Thu, 28 Apr 2016 19:29:45 +0000 (19:29 +0000)]
Camera: Documentation updates am: 62cfd97 am: 58b8e6e
am: bf61f8aaaf

* commit 'bf61f8aaaf2aa15ede35bcfdd67d2db10186f638':
  Camera: Documentation updates

Change-Id: Ideda4b074d10651c88489d2c9957299b0abb94fe

8 years agoCamera: update video stabilization API doc. am: 161c29c am: 569abce
Jianing Wei [Thu, 28 Apr 2016 19:29:44 +0000 (19:29 +0000)]
Camera: update video stabilization API doc. am: 161c29c am: 569abce
am: 3c770fa86d

* commit '3c770fa86d938d760f390705088dadb3cb81aada':
  Camera: update video stabilization API doc.

Change-Id: I75328598902aeca837be9a158fcb708f4adc5f2b