OSDN Git Service

android-x86/system-media.git
7 years agoMerge tag 'android-7.1.2_r2' into cm-14.1 android-x86-7.1-r1 android-x86-7.1-r2
Dan Pasanen [Wed, 5 Apr 2017 12:27:53 +0000 (07:27 -0500)]
Merge tag 'android-7.1.2_r2' into cm-14.1

Android 7.1.2 Release 2 (N2G47E)

# gpg: Signature made Mon 03 Apr 2017 01:41:52 AM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key

7 years agoaudio_route: Add support to set complete byte arrays
Andreas Schneider [Wed, 8 Feb 2017 09:07:58 +0000 (10:07 +0100)]
audio_route: Add support to set complete byte arrays

This adds a new directive <param> and allows us to set several values in
a byte array.

    <param name="DSP4 XM f010:0" value="0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0" />

Change-Id: I9eda4cad414cd60e80b257c95858ff3e7fc2be07
(cherry picked from commit 57fc1b8289fbb2359f45ce4d156a74a4dc531709)

7 years agoeffects: Add AUDIO_EFFECT_VENDOR_CONFIG_FILE2
Steve Kondik [Wed, 13 Jan 2016 00:35:57 +0000 (16:35 -0800)]
effects: Add AUDIO_EFFECT_VENDOR_CONFIG_FILE2

Change-Id: I457f8bd4229062a0348e7bcc1d88e1123aac4dc8

7 years agoaudio_route: fix unsupported control types in audio_route_update_path
Christian Morlok [Sat, 21 Nov 2015 10:49:36 +0000 (11:49 +0100)]
audio_route: fix unsupported control types in audio_route_update_path

I don't like infinite loops

Change-Id: I57f1f871b572c68cf1d7adef599396a3cbb7fc5d

7 years agoaudio: Add helper method for PCM offload formats
Steve Kondik [Fri, 16 Oct 2015 09:06:35 +0000 (02:06 -0700)]
audio: Add helper method for PCM offload formats

Change-Id: Ie00a65ad1449c1838fd4335b7083351c59240e9c

7 years agoMerge 729a950aeb34ab241901bd7ed61e3baedc415770 on remote branch
Linux Build Service Account [Thu, 15 Dec 2016 10:06:55 +0000 (03:06 -0700)]
Merge 729a950aeb34ab241901bd7ed61e3baedc415770 on remote branch

Change-Id: I05b58dd556e1462feeb842f89a37c91b0a4639c2

7 years agoMerge N-MR1 to remote branch.
Naveen Kumar [Wed, 7 Dec 2016 14:42:44 +0000 (20:12 +0530)]
Merge N-MR1 to remote branch.

Change-Id: Ie8b9838d0fdd3d2035dbc85fb3d7e7a55770fc63

7 years agoMerge commit 'ff3e6f401eb371bd51eaed91bfec1728ec22f3d1' into remote
Lalit Kansara [Tue, 6 Dec 2016 09:44:24 +0000 (15:14 +0530)]
Merge commit 'ff3e6f401eb371bd51eaed91bfec1728ec22f3d1' into remote

Conflicts:
audio/include/system/audio.h
camera/src/camera_metadata.c

Change-Id: Ifcce13c7d3bd4a68d34f9b09c92df3c6141af2e9

7 years agoMerge 701da7350b010eeb15518d140c4605f3ff11a4e2 on remote branch
Linux Build Service Account [Tue, 6 Dec 2016 07:55:37 +0000 (00:55 -0700)]
Merge 701da7350b010eeb15518d140c4605f3ff11a4e2 on remote branch

Change-Id: I880af459f5dbc4647455999cdd414f8d9202082f

7 years agoMerge c187d48bdcdb6497b37b0a0a5fe6898ee3cd98d2 on remote branch
Linux Build Service Account [Mon, 21 Nov 2016 21:22:17 +0000 (13:22 -0800)]
Merge c187d48bdcdb6497b37b0a0a5fe6898ee3cd98d2 on remote branch

Change-Id: I391ae5157ab32ebda764b2e76b897536f54938eb

7 years agoPromotion of android-framework.lnx.2.0.c1-00006.
Linux Build Service Account [Wed, 16 Nov 2016 13:31:30 +0000 (06:31 -0700)]
Promotion of android-framework.lnx.2.0.c1-00006.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1084589   Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b   Fix potential overflow in Visualizer effect

Change-Id: I3cdeb64f4497f854e157036040901b467e0189aa
CRs-Fixed: 1084589

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 23 Aug 2016 18:09:52 +0000 (11:09 -0700)]
Fix potential overflow in Visualizer effect

Bug: 30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
(cherry picked from commit b61dd321d08b21a5629044eca7f96e2ecd348e5f)
(cherry picked from commit 7bbd5008747431d42e2f8cfbc0ddcb8465cdb4a5)
(cherry picked from commit a6274f03b4dfe1c3a22af51e3a17ea56a314e747)

7 years agoPromotion of android-framework.lnx.2.0-00018.
Linux Build Service Account [Fri, 11 Nov 2016 09:14:40 +0000 (02:14 -0700)]
Promotion of android-framework.lnx.2.0-00018.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1084589   Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b   Fix potential overflow in Visualizer effect

Change-Id: Id77abbce038ee4647efc0905457c24321bc95d6f
CRs-Fixed: 1084589

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 23 Aug 2016 18:09:52 +0000 (11:09 -0700)]
Fix potential overflow in Visualizer effect

Bug: 30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
(cherry picked from commit b61dd321d08b21a5629044eca7f96e2ecd348e5f)
(cherry picked from commit 7bbd5008747431d42e2f8cfbc0ddcb8465cdb4a5)
(cherry picked from commit a6274f03b4dfe1c3a22af51e3a17ea56a314e747)

7 years agoMerge 1d7f5b36d1cf486672dde6f6c4ad2c94b639b904 on remote branch
Linux Build Service Account [Sat, 22 Oct 2016 15:04:26 +0000 (09:04 -0600)]
Merge 1d7f5b36d1cf486672dde6f6c4ad2c94b639b904 on remote branch

Change-Id: I456483fc2e4378532f164381fc9e43ade6736664

7 years agoaudio_route: add check on enum values
Eric Laurent [Thu, 13 Oct 2016 00:19:40 +0000 (00:19 +0000)]
audio_route: add check on enum values
am: ff3e6f401e

Change-Id: I4a9cfe96aac7472dde381cbb8756353d3cd128f2

7 years agoaudio_route: add check on enum values
Eric Laurent [Wed, 12 Oct 2016 17:38:12 +0000 (10:38 -0700)]
audio_route: add check on enum values

Bug: 31906753
Bug: 32064030
Change-Id: Id57ad136b2c314040e6cbf62a3319ecef2c2114b

7 years agoPromotion of android-framework.lnx.2.0-00013.
Linux Build Service Account [Wed, 12 Oct 2016 09:35:05 +0000 (03:35 -0600)]
Promotion of android-framework.lnx.2.0-00013.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1065990   I6405fe608567a4f4113674050f826f305ecae030   Camera: Prevent data size overflow
1065989   Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2   Camera metadata: Check for inconsistent data count

Change-Id: I090300125111c9c4cba77a41b78ac3ca74f0550b
CRs-Fixed: 10659901065989

7 years agoCamera metadata: Check for inconsistent data count
Eino-Ville Talvala [Tue, 16 Aug 2016 22:48:05 +0000 (15:48 -0700)]
Camera metadata: Check for inconsistent data count

Resolve merge conflict for nyc-release
Also check for overflow of data/entry count on append.

Bug: 30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2
(cherry picked from commit e9e44f797742f52996ebf307740dad58c28fd9b5)
(cherry picked from commit 8188864cf88914e222d60cdded7fbc51fd48fddc)

7 years agoCamera: Prevent data size overflow
Chien-Yu Chen [Fri, 12 Aug 2016 22:40:16 +0000 (15:40 -0700)]
Camera: Prevent data size overflow

Add a function to check overflow when calculating metadata
data size.

Bug: 30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030
(cherry picked from commit 8e7a2b4d13bff03973dbad2bfb88a04296140433)
(cherry picked from commit a0cbcf8be808d0204ce4f42ba23452bf6134ad16)

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 07:15:42 +0000 (07:15 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a am: 48309eb29c am: b0b84bc962
am: bfab6fae72

Change-Id: Iff2f2afb8ad109b9dfdfa4e80dde7ab06bea485f

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 06:38:02 +0000 (06:38 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a am: 48309eb29c
am: b0b84bc962

Change-Id: I042fd15d5349c48f7c5aa9a97d31dc66c9380b93

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 06:05:28 +0000 (06:05 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a
am: 48309eb29c

Change-Id: Ie6b3730caae23ff2d652475902d208f0db3063f5

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 04:52:09 +0000 (04:52 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b
am: 1414a77d6a

Change-Id: I6247298111aca3a0e3a1cfb6996d23a11b1795b0

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 04:33:42 +0000 (04:33 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5
am: 453066787b

Change-Id: I56ee2f6ae9366d1ec501a76519cab46cf3381046

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 04:27:29 +0000 (04:27 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318
am: 0fafbe88b5

Change-Id: I6cdeb5b4234c5e6fcb2882ab7a778fa0894a28ed

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 04:24:41 +0000 (04:24 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a
am: e1bc1ac318

Change-Id: Id679d6bcb437c23b4307eff166d3040ccf7aec48

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 02:31:04 +0000 (02:31 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f
am: af1e40957a

Change-Id: I574c3cf08bc48e3600321da4a00c21cb8bc32b09

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 01:47:11 +0000 (01:47 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b
am: 902b06895f

Change-Id: If84ad0268c76e0113d235e9ab026d634cae9f138

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 01:28:00 +0000 (01:28 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9
am: 960cba3e1b

Change-Id: Ie001c2546d97cb913ad178427f5b283d58b80d38

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a
rago [Tue, 20 Sep 2016 00:57:05 +0000 (00:57 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a
am: a5dddadec9

Change-Id: I8fcbe5c0edfab078d4b86b6b6dd08d7c36b4dc91

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f
rago [Tue, 20 Sep 2016 00:46:12 +0000 (00:46 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f
am: 8682da681a

Change-Id: I2393804a8d234f7374a9e65fc358e10b3c2a3a88

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874
rago [Tue, 20 Sep 2016 00:39:51 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874
am: 99589ed96f

Change-Id: I99309d36b1db752ed86d2b3f13456cd4f0cd6be1

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 20 Sep 2016 00:35:06 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am: 7bbd500874

Change-Id: I88bbbf8cfa578a86a692d75dd5a8cab00be0dcfc

7 years agoaudio: Add support for encoder configuration
Naresh Tanniru [Tue, 17 May 2016 16:02:45 +0000 (21:32 +0530)]
audio: Add support for encoder configuration

- Add SBC , APTX encoders

- Add support for SBC, AAC, APTX encoder
  configuration

Change-Id: If126c6764cfd7a2e46cb7784ad899681de581b56

7 years agoaudio_utils: Support more format conversions
Ashish Jain [Fri, 27 May 2016 09:00:49 +0000 (14:30 +0530)]
audio_utils: Support more format conversions

Support conversion from 32 bit PCM to 24 bit packed pcm.
Support conversion from 8_24 bit to 24 bit packed pcm.

Change-Id: I328ef6ed865f73e49be50ffa1b4e07e865df0339

7 years agoaudio: add DSD format to enum list.
Preetam Singh Ranawat [Thu, 12 May 2016 10:39:47 +0000 (16:09 +0530)]
audio: add DSD format to enum list.

-add DSD as a new format type to the format enum list and
 make it a valid audio format.

Change-Id: I40819512d9e09f5e7fdc3506f9f3516a1b037663

7 years agoaudio: Add Audio Proxy device
Yamit Mehta [Sat, 11 Jul 2015 17:58:27 +0000 (23:28 +0530)]
audio: Add Audio Proxy device

Add audio proxy device for WFD and Visualiser.

Change-Id: Ie35a43943b12e92172da564126d2719629c47829

7 years agoaudio: add support for extended audio features
Mingming Yin [Thu, 6 Aug 2015 21:18:34 +0000 (14:18 -0700)]
audio: add support for extended audio features

- Add extended enums for audio stream, audio
  source, audio format, audio channel, audio
  device, and audio flags
- This all squashes all other changes to this file.

audio : Add PCM offload formats
Change-Id: Ib4229440dc362905753ef8e6444cbf0940fca885

audio: Add support for AAC ADTS offload
Change-Id: I496faf9fb7b7742b674da52ef6f45494f5e3de88

audio: add support for direct pcm
Change-Id: Ie39c2f666e9d4ec1e1c20fdc648d8c04f0f2edce

Change-Id: I5b05eade71ab12b5e08e2f186d40e787a2af024a

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 23 Aug 2016 18:09:52 +0000 (11:09 -0700)]
Fix potential overflow in Visualizer effect

Bug: 30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
(cherry picked from commit b61dd321d08b21a5629044eca7f96e2ecd348e5f)

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:37:48 +0000 (23:37 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5 am: 000c33c8eb
am: 220505e6fe

Change-Id: I15906d44b27b3e7513dcee541f25a239dbe54d04

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:34:48 +0000 (23:34 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5
am: 000c33c8eb

Change-Id: I5b4d1e7d07d2ebd5c2c488b3dd3d76e1dcb6d93a

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:31:47 +0000 (23:31 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb
am: bf7bc974e5

Change-Id: I377dc993ede01f12a070ae01f4df0e90ac054ba4

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:28:47 +0000 (23:28 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063
am: ac2655b5cb

Change-Id: I51396e87a67e735379249335e0c229f892db6412

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:25:48 +0000 (23:25 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc
am: 3197a71063

Change-Id: Id1f6192897346ce3c6b71c28c7143a6c0cce658d

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:22:50 +0000 (23:22 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e
am: e0cb79f1bc

Change-Id: Ia82eb5aad072dc424a010b384019140ff05e792e

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:18:48 +0000 (23:18 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99
am: ab159ee14e

Change-Id: I34352f989484eeac66e4a87f51a2408b4fbf10b3

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2
Eino-Ville Talvala [Wed, 17 Aug 2016 23:17:01 +0000 (23:17 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2
am: 6f21973d99

Change-Id: I25bd8261bb5962ce12e5321156837e9ef8be06b2

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834
Eino-Ville Talvala [Wed, 17 Aug 2016 23:10:19 +0000 (23:10 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834
am: 009bc279a2

Change-Id: Ic3b18ebaaee959686e6ed29a1289fbcfb50de8de

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev
Eino-Ville Talvala [Wed, 17 Aug 2016 23:06:15 +0000 (23:06 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev
am: 53d55d7834

Change-Id: If95d67bf8169f121f824639c7324f5470169e59e

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev
Eino-Ville Talvala [Wed, 17 Aug 2016 21:30:39 +0000 (14:30 -0700)]
resolve merge conflicts of 28ce9cd to lmp-dev

Change-Id: I52e1077e21545b15a9b568a3c048580de99c8080

7 years agoCamera metadata: Check for inconsistent data count am: 241ff3e1ce
Eino-Ville Talvala [Wed, 17 Aug 2016 21:07:06 +0000 (21:07 +0000)]
Camera metadata: Check for inconsistent data count am: 241ff3e1ce
am: 59bc9e30bd

Change-Id: Ie09a5953eb7e44e45838306b2998f70541081499

7 years agoCamera metadata: Check for inconsistent data count
Eino-Ville Talvala [Wed, 17 Aug 2016 21:04:06 +0000 (21:04 +0000)]
Camera metadata: Check for inconsistent data count
am: 241ff3e1ce

Change-Id: I780f5c31874d12a2d6e16c4658902e271f07ddcf

7 years agoMerge "Camera metadata: Check for inconsistent data count" into nyc-mr1-dev
Eino-Ville Talvala [Wed, 17 Aug 2016 20:01:33 +0000 (20:01 +0000)]
Merge "Camera metadata: Check for inconsistent data count" into nyc-mr1-dev
am: 29d15c5fe4

Change-Id: I0bdf4fc047fea5e497b03ecb3592f88b8145ee47

7 years agoCamera metadata: Check for inconsistent data count
Eino-Ville Talvala [Wed, 17 Aug 2016 20:01:33 +0000 (20:01 +0000)]
Camera metadata: Check for inconsistent data count
am: 4633133e74

Change-Id: If20e5ca9dfca25ede12259ee3fcd3459df39a59e

7 years agoMerge "Camera metadata: Check for inconsistent data count" into nyc-mr1-dev
Eino-Ville Talvala [Wed, 17 Aug 2016 19:58:46 +0000 (19:58 +0000)]
Merge "Camera metadata: Check for inconsistent data count" into nyc-mr1-dev

7 years agoCamera metadata: Check for inconsistent data count
Eino-Ville Talvala [Tue, 16 Aug 2016 22:48:05 +0000 (15:48 -0700)]
Camera metadata: Check for inconsistent data count

Also check for overflow of data/entry count on append.

Bug: 30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 18:13:54 +0000 (18:13 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93 am: 6c1911e48b am: 40239912e1 am: 49f0bdca65 am: e961e9eb2a am: 29afa93f4f am: 15c8ca5488 am: 0efacfef74 am: 61192805c0
am: 82dee6974a

Change-Id: Ia0a250d5b62f0a9761733a274346109df4044ca3

7 years agoCamera: Prevent data size overflow
Chien-Yu Chen [Wed, 17 Aug 2016 18:13:53 +0000 (18:13 +0000)]
Camera: Prevent data size overflow
am: 62d8d87dd3

Change-Id: If61c045cf3629152f4ccef1c11e8be18d04e4233

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 17:50:58 +0000 (17:50 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93 am: 6c1911e48b am: 40239912e1 am: 49f0bdca65 am: e961e9eb2a am: 29afa93f4f am: 15c8ca5488 am: 0efacfef74
am: 61192805c0

Change-Id: If57362340eb6662b6ff43e39de7f256450da08fb

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 17:47:59 +0000 (17:47 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93 am: 6c1911e48b am: 40239912e1 am: 49f0bdca65 am: e961e9eb2a am: 29afa93f4f am: 15c8ca5488
am: 0efacfef74

Change-Id: If80efe9cfe79e980f1c7b3422e25e87f26e2d057

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 17:44:36 +0000 (17:44 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93 am: 6c1911e48b am: 40239912e1 am: 49f0bdca65 am: e961e9eb2a am: 29afa93f4f
am: 15c8ca5488

Change-Id: I3ace8ead9bae0eef1e8e1a7815edb732dfa3ef3c

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 17:41:54 +0000 (17:41 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93 am: 6c1911e48b am: 40239912e1 am: 49f0bdca65 am: e961e9eb2a
am: 29afa93f4f

Change-Id: Ibd99d91c9f03a9d6194845de3326c9b56093ad1b

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 17:39:55 +0000 (17:39 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93 am: 6c1911e48b am: 40239912e1 am: 49f0bdca65
am: e961e9eb2a

Change-Id: I7754af66c50514f3bf97cbf31e3274f3274731a1

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 17:35:21 +0000 (17:35 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93 am: 6c1911e48b am: 40239912e1
am: 49f0bdca65

Change-Id: Ibc41693c4b37a010913bf63d6caea31c6345350d

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 17:31:22 +0000 (17:31 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93 am: 6c1911e48b
am: 40239912e1

Change-Id: I1866145d7ab1e6a03ce9504f5a872883a0259bc6

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
Chien-Yu Chen [Wed, 17 Aug 2016 00:10:54 +0000 (00:10 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am: 6ebb3d2a93
am: 6c1911e48b

Change-Id: I1399829b7532c142ce9352a096e2f73520fc38b5

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3
Chien-Yu Chen [Wed, 17 Aug 2016 00:08:29 +0000 (00:08 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3
am: 6ebb3d2a93

Change-Id: I25af01fd5dd1ccada3105da84893e6ea7bff119b

7 years agoCamera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec
Chien-Yu Chen [Wed, 17 Aug 2016 00:05:22 +0000 (00:05 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec
am: 4d15f88da3

Change-Id: I637b2009b6fb1c985c867ced35f4cadf0b7d21f9

7 years agoCamera: Prevent data size overflow am: 97a9cd6748
Chien-Yu Chen [Wed, 17 Aug 2016 00:02:26 +0000 (00:02 +0000)]
Camera: Prevent data size overflow am: 97a9cd6748
am: 5ccb5b43ec

Change-Id: I3c828a810c29bc5a1f24bac2d6dfd59d9989f8f0

7 years agoCamera: Prevent data size overflow
Chien-Yu Chen [Wed, 17 Aug 2016 00:01:16 +0000 (00:01 +0000)]
Camera: Prevent data size overflow
am: 97a9cd6748

Change-Id: I45dd85c5fb5e8066d4fe66f5f07bdfd8cd0d6789

7 years agoCamera metadata: Check for inconsistent data count
Eino-Ville Talvala [Tue, 16 Aug 2016 22:48:05 +0000 (15:48 -0700)]
Camera metadata: Check for inconsistent data count

Also check for overflow of data/entry count on append.

Bug: 30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2

7 years agoCamera: Prevent data size overflow
Chien-Yu Chen [Fri, 12 Aug 2016 22:40:16 +0000 (15:40 -0700)]
Camera: Prevent data size overflow

Add a function to check overflow when calculating metadata
data size.

Bug: 30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030

7 years agoCamera: Prevent data size overflow
Chien-Yu Chen [Fri, 12 Aug 2016 22:40:16 +0000 (15:40 -0700)]
Camera: Prevent data size overflow

Add a function to check overflow when calculating metadata
data size.

Bug: 30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030

7 years agoMerge "audio_utils: Support more format conversions" into nyc-mr1-dev
Glenn Kasten [Tue, 12 Jul 2016 17:20:26 +0000 (17:20 +0000)]
Merge "audio_utils: Support more format conversions" into nyc-mr1-dev

7 years agoMerge "Add host native build of primitives_test" into nyc-mr1-dev
Glenn Kasten [Mon, 11 Jul 2016 22:14:35 +0000 (22:14 +0000)]
Merge "Add host native build of primitives_test" into nyc-mr1-dev

7 years agoaudio_utils: Support more format conversions
Haynes Mathew George [Tue, 28 Jun 2016 20:52:18 +0000 (13:52 -0700)]
audio_utils: Support more format conversions

Support conversion from 32 bit pcm to 24 bit packed pcm.
Support conversion from 8_24 bit to 24 bit packed pcm.
Support conversion from 24 bit packed pcm to 32 bit pcm.

authored-by: Ashish Jain <ashishj@codeaurora.org>

Change-Id: I328ef6ed865f73e49be50ffa1b4e07e865df0339

7 years agoAdd host native build of primitives_test
Glenn Kasten [Fri, 8 Jul 2016 21:10:33 +0000 (14:10 -0700)]
Add host native build of primitives_test

Change-Id: Ib3271c787363e63800cdf40984e2b345e0e4ed6e

7 years agoAdd Dolby TrueHD audio format
Eric Laurent [Fri, 8 Jul 2016 01:53:19 +0000 (18:53 -0700)]
Add Dolby TrueHD audio format

Bug: 30024357
Change-Id: I2ca8d24e9b9b053a42e1bcf3802fdf866f82053d

7 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

7 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 8 Jun 2016 07:04:02 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev

7 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

7 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

7 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

7 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 5 Jun 2016 07:06:04 +0000 (00:06 -0700)]
merge in nyc-release history after reset to nyc-dev

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 15 May 2016 00:04:53 +0000 (00:04 +0000)]
merge in nyc-release history after reset to nyc-dev

7 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

7 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

7 years agoCamera: update FPS range spec am: 206bf4d am: 386195f
Yin-Chia Yeh [Thu, 28 Apr 2016 17:32:31 +0000 (17:32 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f
am: ea549f4

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

Change-Id: Ia19cd6c9dd7453a4b7549ccea74bc4f537d1fee3

7 years agoCamera: Documentation updates am: 62cfd97 am: 58b8e6e
Eino-Ville Talvala [Thu, 28 Apr 2016 17:32:31 +0000 (17:32 +0000)]
Camera: Documentation updates am: 62cfd97 am: 58b8e6e
am: bf61f8a

* commit 'bf61f8aaaf2aa15ede35bcfdd67d2db10186f638':
  Camera: Documentation updates

Change-Id: I649a515a4430b65a70f1697c2ea59efe767681cf

7 years agoCamera: update video stabilization API doc. am: 161c29c am: 569abce
Jianing Wei [Thu, 28 Apr 2016 17:32:30 +0000 (17:32 +0000)]
Camera: update video stabilization API doc. am: 161c29c am: 569abce
am: 3c770fa

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

Change-Id: I7bf39b86ac180359de611442f00274216b364281

7 years agoCamera: update FPS range spec am: 206bf4d
Yin-Chia Yeh [Thu, 28 Apr 2016 17:30:07 +0000 (17:30 +0000)]
Camera: update FPS range spec am: 206bf4d
am: 386195f

* commit '386195f42bc2ca44ae20fd0c5444036790f72acd':
  Camera: update FPS range spec

Change-Id: I4d709e12091a364fc9877a7172c31057872841c3

7 years agoCamera: Documentation updates am: 62cfd97
Eino-Ville Talvala [Thu, 28 Apr 2016 17:30:07 +0000 (17:30 +0000)]
Camera: Documentation updates am: 62cfd97
am: 58b8e6e

* commit '58b8e6e943da4e24daf3745a1b567cc99e241895':
  Camera: Documentation updates

Change-Id: I1fa2d5f1d74ce703ab9d2bc10448acc10fb1998f