OSDN Git Service
Elliott Hughes [Thu, 24 Aug 2017 15:47:12 +0000 (15:47 +0000)]
Merge "C++14 is the default now."
am:
780c6311c5
Change-Id: Icdebfede104aced643ab6218ef12e3c530b1908c
Elliott Hughes [Thu, 24 Aug 2017 15:40:54 +0000 (15:40 +0000)]
Merge "C++14 is the default now."
Elliott Hughes [Sat, 12 Aug 2017 05:59:49 +0000 (22:59 -0700)]
C++14 is the default now.
Bug: http://b/
32019064
Test: builds
Change-Id: I75b37a65d9ba6a7fc6586948f2e9544cede377a8
Android Build Merger (Role) [Wed, 9 Aug 2017 01:50:33 +0000 (01:50 +0000)]
Merge "Camera: update NDK docs am:
f850d6ea72 am:
de176c492a" into oc-dr1-dev-plus-aosp
Yin-Chia Yeh [Wed, 9 Aug 2017 01:50:01 +0000 (01:50 +0000)]
Camera: update NDK docs am:
f850d6ea72
am:
2b57c9ada1
Change-Id: I0c6c9ac846278c0330c80b3f91fddbf5d210e471
Yin-Chia Yeh [Wed, 9 Aug 2017 01:50:01 +0000 (01:50 +0000)]
Camera: update NDK docs am:
f850d6ea72
am:
de176c492a
Change-Id: If8fd505e514431908be8818829e4323cb3bb636b
Yin-Chia Yeh [Wed, 9 Aug 2017 01:45:03 +0000 (01:45 +0000)]
Camera: update NDK docs
am:
f850d6ea72
Change-Id: I8790351bd0732a3c0b3e2a5525feb9a74ab3bd93
Yin-Chia Yeh [Wed, 9 Aug 2017 01:45:03 +0000 (01:45 +0000)]
Camera: update NDK docs
am:
f850d6ea72
Change-Id: I18375c0b3b0ace6da868d76de8aefe1ec3b7adfa
Yin-Chia Yeh [Fri, 4 Aug 2017 01:07:45 +0000 (18:07 -0700)]
Camera: update NDK docs
Add type information to the doc paragraph.
Bug:
64304111
Test: build (doc only change)
Change-Id: Ifc3b8068d308ad2571ad66ddf5850b1cdc4163d6
Eric Laurent [Wed, 26 Jul 2017 20:33:56 +0000 (20:33 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626."" am:
13669840c9 am:
e07ce47a5e
am:
7810642267
Change-Id: I6e5bb1adbb76a40be7b3a94d9e06160b0de4ce3a
Eric Laurent [Wed, 26 Jul 2017 20:29:14 +0000 (20:29 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626."" am:
13669840c9
am:
e07ce47a5e
Change-Id: I635e5fe0b8a46721011b235e565bc3e153117a2e
Eric Laurent [Wed, 26 Jul 2017 20:19:33 +0000 (20:19 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626.""
am:
13669840c9
Change-Id: Ic9f40e6c258530ad537f98e01a713b48ba0addf1
Eric Laurent [Wed, 26 Jul 2017 20:02:18 +0000 (20:02 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626.""
Luis Hector Chavez [Wed, 26 Jul 2017 17:36:04 +0000 (17:36 +0000)]
Revert "media: Update libchrome APIS to r456626."
This reverts commit
247b914250c9095705965a673452866fed4d4162.
Reason for revert: Broke the mac_sdk
Exempt-From-Owner-Approval: Fixing mac_sdk
Change-Id: Ic0b808d3e7429462d60e7f571bf9c1197819e72e
Jay Civelli [Wed, 26 Jul 2017 02:01:26 +0000 (02:01 +0000)]
Merge "media: Update libchrome APIS to r456626." am:
9c351fa5f3 am:
3501de6689
am:
8f0560542f
Change-Id: Id43b3912422abb020d7475a0eb335c606a48e765
Jay Civelli [Wed, 26 Jul 2017 01:57:29 +0000 (01:57 +0000)]
Merge "media: Update libchrome APIS to r456626." am:
9c351fa5f3
am:
3501de6689
Change-Id: I863039f5cd0e8e52f0e5ae16281b37c572d7a173
Jay Civelli [Wed, 26 Jul 2017 01:53:59 +0000 (01:53 +0000)]
Merge "media: Update libchrome APIS to r456626."
am:
9c351fa5f3
Change-Id: I1f43c0bce6a557724ffc0bf5b25ebc2d6254ddcc
Treehugger Robot [Wed, 26 Jul 2017 01:47:46 +0000 (01:47 +0000)]
Merge "media: Update libchrome APIS to r456626."
Colin Cross [Sat, 1 Jul 2017 04:28:24 +0000 (04:28 +0000)]
Merge "Make inlines static" into stage-aosp-master am:
b76693c9fc -s ours
am:
90492da5ed -s ours
Change-Id: I9a009c1c30356afb4727d6b19c3b1702d16393a5
Colin Cross [Sat, 1 Jul 2017 04:23:23 +0000 (04:23 +0000)]
Merge "Make inlines static" into stage-aosp-master
am:
b76693c9fc -s ours
Change-Id: I4145373db5dd90dfa52097c09221b64c2bd41f0e
TreeHugger Robot [Sat, 1 Jul 2017 04:15:25 +0000 (04:15 +0000)]
Merge "Make inlines static" into stage-aosp-master
Colin Cross [Sat, 1 Jul 2017 04:13:50 +0000 (04:13 +0000)]
Merge "Make inlines static" am:
e338b979f9 -s ours am:
9c99a1cf3c -s ours
am:
f8ae91e368 -s ours
Change-Id: I9500c90890e0ef29100cf2c976ddba851285d0aa
Colin Cross [Sat, 1 Jul 2017 04:10:19 +0000 (04:10 +0000)]
Merge "Make inlines static" am:
e338b979f9 -s ours
am:
9c99a1cf3c -s ours
Change-Id: Iad102434f85ddf68f5d2a67796bb4adc472bebf2
Colin Cross [Sat, 1 Jul 2017 04:05:27 +0000 (04:05 +0000)]
Merge "Make inlines static"
am:
e338b979f9 -s ours
Change-Id: I2a94c355f424a516069077cb3aa8d4dd1d5cd716
Colin Cross [Fri, 30 Jun 2017 21:05:23 +0000 (14:05 -0700)]
Make inlines static
Compiling the non-static inlines with -Oz results in missing symbols,
because clang chooses not to inline the functions but also doesn't
emit a definition because they are not static or extern. They are
only used in this .c file, so make them static.
Test: builds with -Oz
Bug:
62549703
Change-Id: Ibb78ad982c2911e151f0dd6b01eb6164fe6e8e63
Merged-In: Ibb78ad982c2911e151f0dd6b01eb6164fe6e8e63
Treehugger Robot [Sat, 1 Jul 2017 03:11:34 +0000 (03:11 +0000)]
Merge "Make inlines static"
Colin Cross [Sat, 1 Jul 2017 02:18:15 +0000 (02:18 +0000)]
Make inlines static
am:
7a800d960a
Change-Id: Ie86109dd6cc69a3be0168e18d3f266f3f02daa7f
Colin Cross [Fri, 30 Jun 2017 21:05:23 +0000 (14:05 -0700)]
Make inlines static
Compiling the non-static inlines with -Oz results in missing symbols,
because clang chooses not to inline the functions but also doesn't
emit a definition because they are not static or extern. They are
only used in this .c file, so make them static.
Test: builds with -Oz
Bug:
62549703
Change-Id: Ibb78ad982c2911e151f0dd6b01eb6164fe6e8e63
Merged-In: Ibb78ad982c2911e151f0dd6b01eb6164fe6e8e63
(cherry picked from commit
c7eae5d84a55de0450b9947a26127ef05cb089a5)
Colin Cross [Fri, 30 Jun 2017 21:05:23 +0000 (14:05 -0700)]
Make inlines static
Compiling the non-static inlines with -Oz results in missing symbols,
because clang chooses not to inline the functions but also doesn't
emit a definition because they are not static or extern. They are
only used in this .c file, so make them static.
Test: builds with -Oz
Bug:
62549703
Change-Id: Ibb78ad982c2911e151f0dd6b01eb6164fe6e8e63
Merged-In: Ibb78ad982c2911e151f0dd6b01eb6164fe6e8e63
(cherry picked from commit
c7eae5d84a55de0450b9947a26127ef05cb089a5)
Tri Vo [Tue, 27 Jun 2017 01:27:12 +0000 (01:27 +0000)]
Merge "fix missing headers" am:
10be5075f2 am:
7180e89fd2
am:
e169ccc7f8
Change-Id: I2de586c016f8559aafaee7681df4556d398043cc
Tri Vo [Tue, 27 Jun 2017 01:24:43 +0000 (01:24 +0000)]
Merge "fix missing headers" am:
10be5075f2
am:
7180e89fd2
Change-Id: I3ba216619d5aa87cce5614876245e717f5813857
Tri Vo [Tue, 27 Jun 2017 01:22:12 +0000 (01:22 +0000)]
Merge "fix missing headers"
am:
10be5075f2
Change-Id: I8791011831e4979b4ef583307d8ed54e92a66279
Tri Vo [Tue, 27 Jun 2017 01:18:37 +0000 (01:18 +0000)]
Merge "fix missing headers"
Tri Vo [Mon, 26 Jun 2017 22:12:57 +0000 (22:12 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h" am:
5ce9898e08 -s ours am:
54c70a0e30 -s ours
am:
997fd7b636 -s ours
Change-Id: Ib204cff630bad507c5726d3b6554b46a755606a2
Tri Vo [Mon, 26 Jun 2017 22:03:59 +0000 (22:03 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h" am:
5ce9898e08 -s ours
am:
54c70a0e30 -s ours
Change-Id: Ibdf5afac0bb8128dd19cfc374585695761609af2
Tri Vo [Mon, 26 Jun 2017 21:58:36 +0000 (21:58 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h"
am:
5ce9898e08 -s ours
Change-Id: I79fd6d39c7eb6fb445285fbf48ddc0c524375bee
Tri Vo [Fri, 23 Jun 2017 22:42:32 +0000 (15:42 -0700)]
fix missing headers
Bug:
33241851
Test: cd system/media && mma -j64 -k BOARD_VNDK_VERSION=current
Change-Id: I7c6e4b271b365f50c376af2925d0f8cbe8e58551
Tri Vo [Mon, 26 Jun 2017 20:35:01 +0000 (20:35 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h"
Glenn Kasten [Fri, 24 Feb 2017 00:55:16 +0000 (16:55 -0800)]
Rename audio_utils/conversion.h to mono_blend.h
There is only one function declared in that header file, and it is
mono_blend, so a more specific filename may be easier to understand.
Test: compiles OK
Merged-In: Ie2aec6c706b1822581b34d3702818b8200a1db8a
Change-Id: Ie2aec6c706b1822581b34d3702818b8200a1db8a
(cherry picked from commit
66c7057547bbbae28704a014a64068a5a6625a48)
Chih-hung Hsieh [Fri, 23 Jun 2017 19:18:32 +0000 (19:18 +0000)]
Merge "Add OWNERS in system/media/camera" am:
c134db6eaa am:
a73060cb62
am:
fbdf010bdb
Change-Id: Ic9a882828907e950030b41ca62d02f2371c0dfe4
Chih-hung Hsieh [Fri, 23 Jun 2017 19:12:07 +0000 (19:12 +0000)]
Merge "Add OWNERS in system/media/camera" am:
c134db6eaa
am:
a73060cb62
Change-Id: Id50556eb466d29a6cc8865fa123999343f250657
Chih-hung Hsieh [Fri, 23 Jun 2017 19:04:00 +0000 (19:04 +0000)]
Merge "Add OWNERS in system/media/camera"
am:
c134db6eaa
Change-Id: Ic1bfebb355acfe77e8cca67b58db2431da0c71fb
Chih-hung Hsieh [Fri, 23 Jun 2017 18:54:42 +0000 (18:54 +0000)]
Merge "Add OWNERS in system/media/camera"
Chih-Hung Hsieh [Wed, 21 Jun 2017 23:16:00 +0000 (16:16 -0700)]
Add OWNERS in system/media/camera
* This is copied from frameworks/av/camera/OWNERS.
* Owners will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I5452c77ed8e9c476c2257718f239fbd56a56ee2e
Jiyong Park [Tue, 20 Jun 2017 09:28:13 +0000 (09:28 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true" am:
b50f705f5c am:
026fd65638 -s ours
am:
0213762dd2 -s ours
Change-Id: I3e3c75b5c9e38e21c1ee9a19a983b4f2896855fb
Jiyong Park [Tue, 20 Jun 2017 09:25:54 +0000 (09:25 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true" am:
b50f705f5c
am:
026fd65638 -s ours
Change-Id: Ibdc5441ed8ea8de1c06aa4caf1d2d0b7446fd58b
Jiyong Park [Tue, 20 Jun 2017 09:22:43 +0000 (09:22 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true"
am:
b50f705f5c
Change-Id: Icd573a4fa9b08a6ea0e5587c60d1623901e6e8f4
Treehugger Robot [Tue, 20 Jun 2017 09:18:00 +0000 (09:18 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true"
Jiyong Park [Mon, 15 May 2017 06:31:44 +0000 (15:31 +0900)]
make libaudioutils_fixedfft vendor_available:true
This, when used with BOARD_VNDK_VERSION flag, enables the
module to be built and installed twice, one for /system,
other for /vendor.
libaudioutils_fixedfft is used by libaudioutils which is in turn used by libs in
/vendor and thus marked as vendor_available. Therefore, libaudioutils_fixedfft
is also marked as vendor_available.
Details: https://android-review.googlesource.com/368372
Bug:
33241851
Test: BOARD_VNDK_VERSION=current m libaudioutils_fixedfft.vendor successful
Merged-In: Ic594eeb153b90ee45e7b5d9b682af9c3ff5471e4
Change-Id: Ic594eeb153b90ee45e7b5d9b682af9c3ff5471e4
(cherry picked from commit
09d178f4f3bc33b347b2f8f6b68e8165f7b4edfc)
Glenn Kasten [Wed, 31 May 2017 14:49:50 +0000 (07:49 -0700)]
Fix Doxygen warnings
Test: 'doxygen' in directory system/media/audio_utils
Change-Id: I0f9e0921009e20be27f6e47863535ec7fb37e748
Jay Civelli [Thu, 30 Mar 2017 17:59:21 +0000 (10:59 -0700)]
media: Update libchrome APIS to r456626.
The new libchrome has been ported from Chromium and some APIs
have changed. Make necessary changes at call sites.
Change-Id: I9bf5b491770efc3009ea2ff3afe9e6d2c1163206
Jiyong Park [Wed, 17 May 2017 03:49:43 +0000 (03:49 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true" into oc-dev am:
b8ca85c9ad
am:
2aaa78baf4 -s ours
Change-Id: Id563440abf0efdf74c904ca382c1cf0d59ab5cf0
Jiyong Park [Wed, 17 May 2017 03:47:35 +0000 (03:47 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true" into oc-dev
am:
b8ca85c9ad
Change-Id: I31e13f7517d8fbe708acd7110eb616be7104b95b
TreeHugger Robot [Wed, 17 May 2017 03:40:20 +0000 (03:40 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true" into oc-dev
Vijay Venkatraman [Wed, 17 May 2017 00:42:42 +0000 (00:42 +0000)]
Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available am:
43338e77ca -s ours
am:
a5e85de42b -s ours
Change-Id: I60129b960ad544b845c73bc6235121109d1e6def
Vijay Venkatraman [Wed, 17 May 2017 00:40:32 +0000 (00:40 +0000)]
Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available
am:
43338e77ca -s ours
Change-Id: If93a55a9fba325332ad20150c2600feaeaf740ab
Vijay Venkatraman [Tue, 9 May 2017 18:30:33 +0000 (11:30 -0700)]
Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as
vendor_available
Bug:
33241851
Bug:
37527576
Test: Build sailfish and pass CTS audio
Test: With BOARD_VNDK_VERSION:=current, no link type check
errors related to these libs
(cherry picked from commit
a25465b1c46c7ac172371b523e816988dd4aa018)
Merged-In: Ifacd2305a79a50f6bf3182344bc678082047022f
Change-Id: Icb17b4266a2c6443e482efd62769dbc430e7501c
Jiyong Park [Mon, 15 May 2017 06:31:44 +0000 (15:31 +0900)]
make libaudioutils_fixedfft vendor_available:true
This, when used with BOARD_VNDK_VERSION flag, enables the
module to be built and installed twice, one for /system,
other for /vendor.
libaudioutils_fixedfft is used by libaudioutils which is in turn used by libs in
/vendor and thus marked as vendor_available. Therefore, libaudioutils_fixedfft
is also marked as vendor_available.
Details: https://android-review.googlesource.com/368372
Bug:
33241851
Test: BOARD_VNDK_VERSION=current m libaudioutils_fixedfft.vendor successful
Merged-In: Ic594eeb153b90ee45e7b5d9b682af9c3ff5471e4
Change-Id: Ic594eeb153b90ee45e7b5d9b682af9c3ff5471e4
(cherry picked from commit
09d178f4f3bc33b347b2f8f6b68e8165f7b4edfc)
Jiyong Park [Mon, 15 May 2017 06:31:44 +0000 (15:31 +0900)]
make libaudioutils_fixedfft vendor_available:true
This, when used with BOARD_VNDK_VERSION flag, enables the
module to be built and installed twice, one for /system,
other for /vendor.
libaudioutils_fixedfft is used by libaudioutils which is in turn used by libs in
/vendor and thus marked as vendor_available. Therefore, libaudioutils_fixedfft
is also marked as vendor_available.
Details: https://android-review.googlesource.com/368372
Bug:
33241851
Test: BOARD_VNDK_VERSION=current m libaudioutils_fixedfft.vendor successful
Change-Id: Ic594eeb153b90ee45e7b5d9b682af9c3ff5471e4
Vijay Venkatraman [Fri, 12 May 2017 23:06:17 +0000 (23:06 +0000)]
Merge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available" am:
74b2fff8f4 am:
4d15f047d6 am:
fcc32970cf
am:
70323e53dc
Change-Id: I33b6f068c1ca033011e37385eb3a56abb4719b58
Vijay Venkatraman [Fri, 12 May 2017 22:52:17 +0000 (22:52 +0000)]
Merge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available" am:
74b2fff8f4 am:
4d15f047d6
am:
fcc32970cf
Change-Id: I658cf987c99c45bd10f72778aef18db9d66ce437
Vijay Venkatraman [Fri, 12 May 2017 22:46:54 +0000 (22:46 +0000)]
Merge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available" am:
74b2fff8f4
am:
4d15f047d6
Change-Id: I840a1f4f73b952187db8840d6d42980f15d10c90
Vijay Venkatraman [Fri, 12 May 2017 22:39:39 +0000 (22:39 +0000)]
Merge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available"
am:
74b2fff8f4
Change-Id: Idfe556963a27260bfff3233dd3caf4aebdc1770e
Vijay Venkatraman [Fri, 12 May 2017 22:27:00 +0000 (22:27 +0000)]
Merge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available"
Isaac Chen [Fri, 12 May 2017 10:29:57 +0000 (10:29 +0000)]
Merge "libalsautils: moved to vendor partition" am:
f03c1c09ed am:
1662e1e5c9 am:
6901b39778
am:
e2d4cdb3d5
Change-Id: Ibf1a24da6cdeaf028195bd4a094acf03d2d283dc
Isaac Chen [Fri, 12 May 2017 10:27:26 +0000 (10:27 +0000)]
Merge "libalsautils: moved to vendor partition" am:
f03c1c09ed am:
1662e1e5c9
am:
6901b39778
Change-Id: I46ba1a35bc7891a5f124319645602e8ce865bc02
Isaac Chen [Fri, 12 May 2017 10:24:56 +0000 (10:24 +0000)]
Merge "libalsautils: moved to vendor partition" am:
f03c1c09ed
am:
1662e1e5c9
Change-Id: If6ad072fcca1e7d7b0064c610f4a64eafc1fe360
Isaac Chen [Fri, 12 May 2017 10:22:27 +0000 (10:22 +0000)]
Merge "libalsautils: moved to vendor partition"
am:
f03c1c09ed
Change-Id: Icdbc804f07606664882aba5024e4b43e32f1c340
Treehugger Robot [Fri, 12 May 2017 10:17:29 +0000 (10:17 +0000)]
Merge "libalsautils: moved to vendor partition"
Isaac Chen [Mon, 10 Apr 2017 06:43:30 +0000 (14:43 +0800)]
libalsautils: moved to vendor partition
Generic AOSP system image doesn't need libalsautils, so move
it to vendor partition in case vendors use it.
Bug:
37117855
Test: Build it with "vendor: true," and make sure it's actually
moved to vendor and also boot successfully on Sailfish.
Change-Id: Ib8c08276f0435b2b37ac6179100b7287b08f6f03
Vijay Venkatraman [Tue, 9 May 2017 18:30:33 +0000 (11:30 -0700)]
Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as
vendor_available
Bug:
33241851
Bug:
37527576
Test: Build sailfish and pass CTS audio
Test: With BOARD_VNDK_VERSION:=current, no link type check
errors related to these libs
Change-Id: Ifacd2305a79a50f6bf3182344bc678082047022f
Chien-Yu Chen [Mon, 8 May 2017 23:06:09 +0000 (23:06 +0000)]
Merge "camera: Clarify ZSL supports" into oc-dev am:
5da5ad056c
am:
87e19cfa91
Change-Id: Ifda46af0bbab972cc00bb8863558332d4ed27099
Chien-Yu Chen [Mon, 8 May 2017 22:39:50 +0000 (22:39 +0000)]
Merge "camera: Clarify ZSL supports" into oc-dev
am:
5da5ad056c
Change-Id: I1b4b1401f4e7ba61bfd1647f93203e591c987ef4
TreeHugger Robot [Mon, 8 May 2017 22:26:45 +0000 (22:26 +0000)]
Merge "camera: Clarify ZSL supports" into oc-dev
Steven Moreland [Sat, 6 May 2017 02:45:23 +0000 (02:45 +0000)]
Merge "libaudioeffects: import/export libhardware_headers" am:
b899f5d93c am:
2804dbe772 am:
bfab76413e
am:
0101927159
Change-Id: I70c3f49785d7b91f2338ecdcc08830b33ac42ce9
Steven Moreland [Sat, 6 May 2017 02:22:54 +0000 (02:22 +0000)]
Merge "libaudioeffects: import/export libhardware_headers" am:
b899f5d93c am:
2804dbe772
am:
bfab76413e
Change-Id: Ie7e1dcb916de7c58b3c41bd9e4e4ee5c14446418
Steven Moreland [Sat, 6 May 2017 02:15:34 +0000 (02:15 +0000)]
Merge "libaudioeffects: import/export libhardware_headers" am:
b899f5d93c
am:
2804dbe772
Change-Id: I542617b846358990ba980cf8f8fefaacff87a7db
Steven Moreland [Sat, 6 May 2017 02:09:03 +0000 (02:09 +0000)]
Merge "libaudioeffects: import/export libhardware_headers"
am:
b899f5d93c
Change-Id: I449fa1eff5055f2cbfd197ebe0774db5b957adc3
Treehugger Robot [Sat, 6 May 2017 01:58:12 +0000 (01:58 +0000)]
Merge "libaudioeffects: import/export libhardware_headers"
Colin Cross [Fri, 5 May 2017 23:07:09 +0000 (23:07 +0000)]
Merge "Update path to camera ndk headers" am:
9d7eff8334 am:
334bca910c am:
344a7212f4 -s ours
am:
f91fa2372e -s ours
Change-Id: I49a98fe9946fe3450f678251af65dd92e66cdcb9
Eino-Ville Talvala [Fri, 5 May 2017 23:06:48 +0000 (23:06 +0000)]
Camera metadata: Fix validation alignment check, add more unit tests am:
0b47c6ef73
am:
292f818fa6
Change-Id: I1c66813c6ba3eab43e590a5ea7be801b85de31f0
Colin Cross [Fri, 5 May 2017 22:55:37 +0000 (22:55 +0000)]
Merge "Update path to camera ndk headers" am:
9d7eff8334 am:
334bca910c
am:
344a7212f4 -s ours
Change-Id: Ie4188461c8159b7d478636be9bc5f20ad1510cf8
Eino-Ville Talvala [Fri, 5 May 2017 22:50:14 +0000 (22:50 +0000)]
Camera metadata: Fix validation alignment check, add more unit tests
am:
0b47c6ef73
Change-Id: I103aefe3900017e8b1dfc4834beaba0f409f3cf9
Colin Cross [Fri, 5 May 2017 22:45:33 +0000 (22:45 +0000)]
Merge "Update path to camera ndk headers" am:
9d7eff8334
am:
334bca910c
Change-Id: I692efffbd9e25e197f0874d69ec8ce991e2e4156
Colin Cross [Fri, 5 May 2017 22:32:32 +0000 (22:32 +0000)]
Merge "Update path to camera ndk headers"
am:
9d7eff8334
Change-Id: I028e232e95e0aef8c559f0f099fb4b5ef5e25e9c
Colin Cross [Fri, 5 May 2017 22:25:05 +0000 (22:25 +0000)]
Merge "Update path to camera ndk headers"
Colin Cross [Fri, 5 May 2017 20:13:58 +0000 (20:13 +0000)]
Update path to camera ndk headers
am:
3282d30589
Change-Id: I8bcd1b07eab2e6d1534dc594be24ba0ab6f4d9df
Colin Cross [Fri, 5 May 2017 16:36:03 +0000 (09:36 -0700)]
Update path to camera ndk headers
Test: generate-metadata
Change-Id: Idcafb23a5483d77296003230ec75bcbdd393cf52
Merged-In: Idcafb23a5483d77296003230ec75bcbdd393cf52
(cherry picked from commit
abc7c4963b25567852b1cdcfbd90a1626dddb3ff)
Colin Cross [Fri, 5 May 2017 16:36:03 +0000 (09:36 -0700)]
Update path to camera ndk headers
Test: generate-metadata
Change-Id: Idcafb23a5483d77296003230ec75bcbdd393cf52
(cherry picked from commit
abc7c4963b25567852b1cdcfbd90a1626dddb3ff)
Colin Cross [Fri, 5 May 2017 20:02:00 +0000 (20:02 +0000)]
Merge "Update path to camera ndk headers"
Eino-Ville Talvala [Fri, 5 May 2017 18:03:56 +0000 (11:03 -0700)]
Camera metadata: Fix validation alignment check, add more unit tests
- Add unit test to ensure validate_camera_metadata_structure correctly
reports VALIDATION_SHIFTED for all shifts
- Fix alignment validation bug found by unit test - need to offset
pointer on both sides of align check.
Test: New unit test passes, no camera CTS regression
Bug:
37980415
Change-Id: I08379bf3792b57c4eae129acc7aa4f22ab960657
Colin Cross [Fri, 5 May 2017 16:36:03 +0000 (09:36 -0700)]
Update path to camera ndk headers
Test: generate-metadata
Change-Id: Idcafb23a5483d77296003230ec75bcbdd393cf52
Steven Moreland [Thu, 4 May 2017 21:06:01 +0000 (14:06 -0700)]
libaudioeffects: import/export libhardware_headers
Required for #include <hardware/audio_effect.h>.
Test: build with BOARD_VNDK_VERSION=current
Bug:
33241851
Change-Id: Ie5b69eddbc47f7de7f1def062e1da54f33a991c2
Eric Laurent [Thu, 4 May 2017 20:18:05 +0000 (20:18 +0000)]
alsa proxy: fix sampling rate checks in proxy_prepare() am:
49bc03cfdc
am:
766e9f48cd
Change-Id: I95523d519fb2aad102a77b1dd7ae853d58d8f810
Eric Laurent [Thu, 4 May 2017 20:14:33 +0000 (20:14 +0000)]
alsa proxy: fix sampling rate checks in proxy_prepare()
am:
49bc03cfdc
Change-Id: Ica03849c6735d56d11c137dcd23c31ca89b171f7
Eric Laurent [Wed, 3 May 2017 18:33:26 +0000 (11:33 -0700)]
alsa proxy: fix sampling rate checks in proxy_prepare()
- proxy_prepare() should not alter the requested properties (format,
sampling rate, channels) without notifying the caller.
- It should not force the sampling rate to the max sampling rate supported
by the profile but just limit it if the requested combination of
sampling rate, channel count and format is not possible.
Bug:
37949012
Test: verify capture over USB at various sampling rates
Change-Id: Id79ca4fda86db1f756e171d131494c3f244b5f2c
Chien-Yu Chen [Wed, 3 May 2017 19:17:47 +0000 (12:17 -0700)]
camera: Clarify ZSL supports
For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG
template.
Test: make
Bug:
34689167
Change-Id: I4e3fab6abb93f697589d5ce541529f8d51095d17
Glenn Kasten [Thu, 27 Apr 2017 21:18:07 +0000 (21:18 +0000)]
Merge "Add an optimized FIFO writer for 32-bit words"
Chien-Yu Chen [Mon, 24 Apr 2017 23:10:43 +0000 (23:10 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev am:
6bbcd2a35d
am:
3d6e104563
Change-Id: I93a368b6824ae6535411487f15b9f9a378f1682f
Chien-Yu Chen [Mon, 24 Apr 2017 22:40:41 +0000 (22:40 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev
am:
6bbcd2a35d
Change-Id: I35a5dea7747bdc2ed554b1c8e71624f2134eb3f9