OSDN Git Service

android-x86/system-media.git
6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 10:12:22 +0000 (03:12 -0700)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8 am: 6837fddebd
am: 4b350d5472

Change-Id: Ie9158972fd863bba1ac99a4437f29487106bcae7

6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 10:06:07 +0000 (03:06 -0700)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8
am: 6837fddebd

Change-Id: I80ae81e9fdcdac5dad4a35641ab2ee7aa17bc9f3

6 years agoMerge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
Emilian Peev [Fri, 11 May 2018 08:53:13 +0000 (09:53 +0100)]
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8

* commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57':
  Camera: Initialize metadata padding field

Test: Camera CTS
Bug: 77238656
Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:34 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10 am: 9fbf06511d am: e09df97fbe am: d0d0d54c51 am: 4feb98a933

Change-Id: Ia67374cd29031a7754fc88f2d571b37e27efe9d5

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:31 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10 am: 9fbf06511d am: e09df97fbe am: d0d0d54c51

Change-Id: I9f265f2ad023a2c55907d2b029d8629428155353

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:29 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10 am: 9fbf06511d am: e09df97fbe

Change-Id: I302f48a487b61353f120dbae83304777b20fde5a

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:26 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10 am: 9fbf06511d

Change-Id: If33362ba096af1c11226021147f671ce0936455a

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:24 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113 am: a0358c3c10

Change-Id: I529ab232eab8b02fdcaf6df9eaa28366c978d36e

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8...
Android Build Merger (Role) [Fri, 11 May 2018 08:47:21 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8 am: e164ecb113

Change-Id: Ic4237032dc357905cde458219a42a2fece3636bc

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8
Android Build Merger (Role) [Fri, 11 May 2018 08:47:18 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263 am: 4c34eb7ac8

Change-Id: I2b38ba060b9398b616ac7adb24816655b7b46384

6 years ago[automerger] Camera: Initialize metadata padding field am: f85ced2263
Android Build Merger (Role) [Fri, 11 May 2018 08:47:16 +0000 (08:47 +0000)]
[automerger] Camera: Initialize metadata padding field am: f85ced2263

Change-Id: Ic1b147fbf96aa567af9ea10533d0012a8765eca4

6 years agoCamera: Initialize metadata padding field
Emilian Peev [Tue, 10 Apr 2018 12:11:43 +0000 (13:11 +0100)]
Camera: Initialize metadata padding field

'padding' field in internal camera metadata structure should be
initialized.

Bug: 77238656
Test: Camera CTS
Change-Id: I57919ec6d6834b5e830be7cbe871558a5da3f266
Merged-In: I57919ec6d6834b5e830be7cbe871558a5da3f266

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
Emilian Peev [Wed, 8 Nov 2017 09:18:46 +0000 (09:18 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407 am: e1d6665905 am: 7a854a6066 am: c5fe6aefeb am: 3fdaebe730 am: 9b1ebd3fba am: a98aeeb454 am: 852082d995 am: 451248f8cf
am: ad0fcdf98e

Change-Id: I39fb59ede8d8d80420d94cdecbf7753fde081b53

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
Emilian Peev [Wed, 8 Nov 2017 09:17:17 +0000 (09:17 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407 am: e1d6665905 am: 7a854a6066 am: c5fe6aefeb am: 3fdaebe730 am: 9b1ebd3fba am: a98aeeb454 am: 852082d995
am: 451248f8cf

Change-Id: I859f983afd66dedb1b924601cdcd86b0221ae40c

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
Emilian Peev [Wed, 8 Nov 2017 09:15:17 +0000 (09:15 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407 am: e1d6665905 am: 7a854a6066 am: c5fe6aefeb am: 3fdaebe730 am: 9b1ebd3fba am: a98aeeb454
am: 852082d995

Change-Id: I86ea2b4fc41e72c15ac826a2b26a44f2eff8d595

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
Emilian Peev [Wed, 8 Nov 2017 09:13:43 +0000 (09:13 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407 am: e1d6665905 am: 7a854a6066 am: c5fe6aefeb am: 3fdaebe730 am: 9b1ebd3fba
am: a98aeeb454

Change-Id: Ic8018da777692c09296dd37e1300273fcd23df15

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
Emilian Peev [Wed, 8 Nov 2017 09:11:43 +0000 (09:11 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407 am: e1d6665905 am: 7a854a6066 am: c5fe6aefeb am: 3fdaebe730
am: 9b1ebd3fba

Change-Id: I7a12ed947dc72e7fdfd36426ca8f849ff6bb0c03

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
Emilian Peev [Wed, 8 Nov 2017 09:09:44 +0000 (09:09 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407 am: e1d6665905 am: 7a854a6066 am: c5fe6aefeb
am: 3fdaebe730

Change-Id: Ie70ae750d490da65efb0c9374390a0c23efc44f4

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
Emilian Peev [Wed, 8 Nov 2017 09:07:16 +0000 (09:07 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407 am: e1d6665905 am: 7a854a6066
am: c5fe6aefeb

Change-Id: Ib84080a0f82b66249c18bad37bb0cac75dcda40f

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
Emilian Peev [Wed, 8 Nov 2017 09:05:15 +0000 (09:05 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407 am: e1d6665905
am: 7a854a6066

Change-Id: Ie73f3adb4ea0314d3549ced7aa2be2142499c383

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407
Emilian Peev [Wed, 8 Nov 2017 09:03:10 +0000 (09:03 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407
am: e1d6665905

Change-Id: Iafcf491f2b32917125541a2da4f262d4a745554c

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6
Emilian Peev [Wed, 8 Nov 2017 09:00:42 +0000 (09:00 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6
am: 6dc0f83407

Change-Id: Ib4986884c9fe83017ee67d544ef6ef549c042cfc

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf
Emilian Peev [Wed, 8 Nov 2017 08:58:10 +0000 (08:58 +0000)]
Camera metadata: Check source metadata size am: 489bbd13bf
am: 90045db6e6

Change-Id: Idfc8486d568546bc889cd1456a14ae9861359740

6 years agoCamera metadata: Check source metadata size
Emilian Peev [Wed, 8 Nov 2017 08:55:39 +0000 (08:55 +0000)]
Camera metadata: Check source metadata size
am: 489bbd13bf

Change-Id: I3664526ef2de813ea2b1c303a53d55246c1b370b

6 years agoCamera metadata: Check source metadata size
Emilian Peev [Mon, 6 Nov 2017 10:41:19 +0000 (10:41 +0000)]
Camera metadata: Check source metadata size

Source size passed by client could be smaller than 'camera_metadata_t'.
In this case the cast in 'allocate_copy_camera_metadata_checked()' will
be incorrect and we will try to access invalid heap memory.

Bug: 67782345
Test: Camera CTS
Change-Id: I9582c704f414493978d09ffb603b5e8368cda5ce

6 years agoCamera: docs: Allow vendor tags inside available tag lists
Emilian Peev [Mon, 25 Sep 2017 08:17:04 +0000 (09:17 +0100)]
Camera: docs: Allow vendor tags inside available tag lists

Allow categorization of vendor tag via:
android.request.availableRequestKeys,
android.request.availableResultKeys,
android.request.availableCharacteristicsKeys

Test: make
Bug: 63817523
Change-Id: I550340b08d4158557a07a8eeeadb0353ebf41e24

7 years agoCamera: update NDK docs am: f850d6ea72
Yin-Chia Yeh [Wed, 9 Aug 2017 01:50:01 +0000 (01:50 +0000)]
Camera: update NDK docs am: f850d6ea72
am: 2b57c9ada1

Change-Id: I55c140d2b647a210759d83af8f060b43ee3ef0a3

7 years agoCamera: update NDK docs
Yin-Chia Yeh [Wed, 9 Aug 2017 01:45:03 +0000 (01:45 +0000)]
Camera: update NDK docs
am: f850d6ea72

Change-Id: I8790351bd0732a3c0b3e2a5525feb9a74ab3bd93

7 years agoCamera: update NDK docs
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

7 years agoMerge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 09:47:45 +0000 (09:47 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev

7 years agoAllow unaligned vector pointers for power computation
Andy Hung [Mon, 31 Jul 2017 22:32:29 +0000 (15:32 -0700)]
Allow unaligned vector pointers for power computation

Test: dedicated native test
Bug: 64151823
Change-Id: I620ba9f673782e5769c499158c6fb866a103a9e4

7 years agoMark the module as VNDK or VNDK-SP in Android.bp
Justin Yun [Mon, 24 Jul 2017 06:19:45 +0000 (15:19 +0900)]
Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: Ia88348f4904dfc6ffb9ad139cac986b4b9438ff7

7 years agoMake libaudioeffects vendor available.
Steven Moreland [Fri, 14 Jul 2017 18:40:35 +0000 (11:40 -0700)]
Make libaudioeffects vendor available.

This means that both system and vendor libraries
can link against it when the vndk is enabled (when
BOARD_VNDK_VERSION=current is set.

Test: build libaudioeffects with BOARD_VNDK_VERSION=current
Bug: 37342627
Change-Id: I1aa26abd1486e5b432617cb37eaf69e777e7ca6f

7 years agoMerge "RDS PI is a number, not a string."
Tomasz Wasilczyk [Wed, 5 Jul 2017 21:19:26 +0000 (21:19 +0000)]
Merge "RDS PI is a number, not a string."

7 years agoMerge "Make inlines static" into stage-aosp-master am: b76693c9fc -s ours am: 90492d...
Colin Cross [Sat, 1 Jul 2017 04:33:24 +0000 (04:33 +0000)]
Merge "Make inlines static" into stage-aosp-master am: b76693c9fc  -s ours am: 90492da5ed  -s ours
am: b48d758f4e  -s ours

Change-Id: I5c25a1f22fd007c345f7c9876d689f949e1fb67c

7 years agoMerge "Make inlines static" into stage-aosp-master am: b76693c9fc -s ours
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

7 years agoMerge "Make inlines static" into stage-aosp-master
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

7 years agoMerge "Make inlines static" am: e338b979f9 -s ours am: 9c99a1cf3c -s ours am: f8ae9...
Colin Cross [Sat, 1 Jul 2017 04:18:56 +0000 (04:18 +0000)]
Merge "Make inlines static" am: e338b979f9  -s ours am: 9c99a1cf3c  -s ours am: f8ae91e368  -s ours
am: 211e5d2574  -s ours

Change-Id: I71886bd5b0df497190ab6bd38f377c3a71053ba2

7 years agoMerge "Make inlines static" into stage-aosp-master
TreeHugger Robot [Sat, 1 Jul 2017 04:15:25 +0000 (04:15 +0000)]
Merge "Make inlines static" into stage-aosp-master

7 years agoMerge "Make inlines static" am: e338b979f9 -s ours am: 9c99a1cf3c -s ours
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

7 years agoMerge "Make inlines static" am: e338b979f9 -s ours
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

7 years agoMerge "Make inlines static"
Colin Cross [Sat, 1 Jul 2017 04:05:27 +0000 (04:05 +0000)]
Merge "Make inlines static"
am: e338b979f9  -s ours

Change-Id: I2a94c355f424a516069077cb3aa8d4dd1d5cd716

7 years agoMake inlines static
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

7 years agoMerge "Make inlines static"
Treehugger Robot [Sat, 1 Jul 2017 03:11:34 +0000 (03:11 +0000)]
Merge "Make inlines static"

7 years agoMake inlines static am: 7a800d960a
Colin Cross [Sat, 1 Jul 2017 02:23:54 +0000 (02:23 +0000)]
Make inlines static am: 7a800d960a
am: c87e4a7687  -s ours

Change-Id: Ia707a8ca1194c00afd6b38aa955f467e9d602190

7 years agoMake inlines static
Colin Cross [Sat, 1 Jul 2017 02:18:15 +0000 (02:18 +0000)]
Make inlines static
am: 7a800d960a

Change-Id: Ie86109dd6cc69a3be0168e18d3f266f3f02daa7f

7 years agoMake inlines static
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)

7 years agoMake inlines static
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)

7 years agoMake inlines static
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

7 years agoRDS PI is a number, not a string.
Tomasz Wasilczyk [Fri, 30 Jun 2017 00:57:01 +0000 (17:57 -0700)]
RDS PI is a number, not a string.

Bug: b/63147256
Test: manual, VTS, instumentalization
Change-Id: I1d3d36ae69866281eac46fd6d1a2356f79cfa6ee

7 years agosystem/media build with BOARD_VNDK_VERSION
Tri Vo [Tue, 27 Jun 2017 16:54:36 +0000 (09:54 -0700)]
system/media build with BOARD_VNDK_VERSION

Bug: 37342627
Test: cd system/media && mma -j64 -k BOARD_VNDK_VERSION=current
Change-Id: I7f99fbe685a960f0506398cdb21a7d86d1d8d4a1

7 years agoMerge "fix missing headers" am: 10be5075f2 am: 7180e89fd2 am: e169ccc7f8
Tri Vo [Tue, 27 Jun 2017 01:29:12 +0000 (01:29 +0000)]
Merge "fix missing headers" am: 10be5075f2 am: 7180e89fd2 am: e169ccc7f8
am: f3ab3d7c1f

Change-Id: I6e8f00a8788fbbcc09cc93b3e0d5f550cbc0a489

7 years agoMerge "fix missing headers" am: 10be5075f2 am: 7180e89fd2
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

7 years agoMerge "fix missing headers" am: 10be5075f2
Tri Vo [Tue, 27 Jun 2017 01:24:43 +0000 (01:24 +0000)]
Merge "fix missing headers" am: 10be5075f2
am: 7180e89fd2

Change-Id: I3ba216619d5aa87cce5614876245e717f5813857

7 years agoMerge "fix missing headers"
Tri Vo [Tue, 27 Jun 2017 01:22:12 +0000 (01:22 +0000)]
Merge "fix missing headers"
am: 10be5075f2

Change-Id: I8791011831e4979b4ef583307d8ed54e92a66279

7 years agoMerge "fix missing headers"
Tri Vo [Tue, 27 Jun 2017 01:18:37 +0000 (01:18 +0000)]
Merge "fix missing headers"

7 years agoMerge "Rename audio_utils/conversion.h to mono_blend.h" am: 5ce9898e08 -s ours am...
Tri Vo [Tue, 27 Jun 2017 01:09:27 +0000 (01:09 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h" am: 5ce9898e08  -s ours am: 54c70a0e30  -s ours am: 997fd7b636  -s ours
am: 05ea368284  -s ours

Change-Id: Icb9113e3040016c44c4caafc73e14b0412328316

7 years agoMerge "Rename audio_utils/conversion.h to mono_blend.h" am: 5ce9898e08 -s ours am...
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

7 years agoMerge "Rename audio_utils/conversion.h to mono_blend.h" am: 5ce9898e08 -s ours
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

7 years agoMerge "Rename audio_utils/conversion.h to mono_blend.h"
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

7 years agofix missing headers
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

7 years agoMerge "Rename audio_utils/conversion.h to mono_blend.h"
Tri Vo [Mon, 26 Jun 2017 20:35:01 +0000 (20:35 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h"

7 years agoRename 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)

7 years agoMerge "Add OWNERS in system/media/camera" am: c134db6eaa am: a73060cb62 am: fbdf010bdb
Chih-hung Hsieh [Fri, 23 Jun 2017 19:23:01 +0000 (19:23 +0000)]
Merge "Add OWNERS in system/media/camera" am: c134db6eaa am: a73060cb62 am: fbdf010bdb
am: f1939af2b5

Change-Id: I87c7be8f13fac0893d057a19fc170116e377ea5c

7 years agoMerge "Add OWNERS in system/media/camera" am: c134db6eaa am: a73060cb62
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

7 years agoMerge "Add OWNERS in system/media/camera" am: c134db6eaa
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

7 years agoMerge "Add OWNERS in system/media/camera"
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

7 years agoMerge "Add OWNERS in system/media/camera"
Chih-hung Hsieh [Fri, 23 Jun 2017 18:54:42 +0000 (18:54 +0000)]
Merge "Add OWNERS in system/media/camera"

7 years agoAdd 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

7 years agoMerge "make libaudioutils_fixedfft vendor_available:true" am: b50f705f5c am: 026fd656...
Jiyong Park [Tue, 20 Jun 2017 09:30:43 +0000 (09:30 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true" am: b50f705f5c am: 026fd65638  -s ours am: 0213762dd2  -s ours
am: 665654504d  -s ours

Change-Id: Iad22abf41d9916744483e3cd0b117047af52905e

7 years agoMerge "make libaudioutils_fixedfft vendor_available:true" am: b50f705f5c am: 026fd656...
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

7 years agoMerge "make libaudioutils_fixedfft vendor_available:true" am: b50f705f5c
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

7 years agoMerge "make libaudioutils_fixedfft vendor_available:true"
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

7 years agoMerge "make libaudioutils_fixedfft vendor_available:true"
Treehugger Robot [Tue, 20 Jun 2017 09:18:00 +0000 (09:18 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true"

7 years agomake 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)

7 years agoFix Doxygen warnings
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

7 years agoMerge "make libaudioutils_fixedfft vendor_available:true" into oc-dev am: b8ca85c9ad
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

7 years agoMerge "make libaudioutils_fixedfft vendor_available:true" into oc-dev
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

7 years agoMerge "make libaudioutils_fixedfft vendor_available:true" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 03:40:20 +0000 (03:40 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true" into oc-dev

7 years agoMoved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_availa...
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

7 years agoMoved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available
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

7 years agoMoved libalsautils to vendor. Marked libaudioutils and libaudioroute as
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

7 years agomake 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)

7 years agomake 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
Change-Id: Ic594eeb153b90ee45e7b5d9b682af9c3ff5471e4

7 years agoMerge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor...
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

7 years agoMerge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor...
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

7 years agoMerge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor...
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

7 years agoMerge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor...
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

7 years agoMerge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor...
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"

7 years agoMerge "libalsautils: moved to vendor partition" am: f03c1c09ed am: 1662e1e5c9 am...
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

7 years agoMerge "libalsautils: moved to vendor partition" am: f03c1c09ed am: 1662e1e5c9
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

7 years agoMerge "libalsautils: moved to vendor partition" am: f03c1c09ed
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

7 years agoMerge "libalsautils: moved to vendor partition"
Isaac Chen [Fri, 12 May 2017 10:22:27 +0000 (10:22 +0000)]
Merge "libalsautils: moved to vendor partition"
am: f03c1c09ed

Change-Id: Icdbc804f07606664882aba5024e4b43e32f1c340

7 years agoMerge "libalsautils: moved to vendor partition"
Treehugger Robot [Fri, 12 May 2017 10:17:29 +0000 (10:17 +0000)]
Merge "libalsautils: moved to vendor partition"

7 years agolibalsautils: 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

7 years agoMoved libalsautils to vendor. Marked libaudioutils and libaudioroute as
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

7 years agoMerge "camera: Clarify ZSL supports" into oc-dev am: 5da5ad056c
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

7 years agoMerge "camera: Clarify ZSL supports" into oc-dev
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

7 years agoMerge "camera: Clarify ZSL supports" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 22:26:45 +0000 (22:26 +0000)]
Merge "camera: Clarify ZSL supports" into oc-dev

7 years agoMerge "libaudioeffects: import/export libhardware_headers" am: b899f5d93c am: 2804dbe...
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