OSDN Git Service

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

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 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: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 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 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 \"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 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

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 [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 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

8 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

8 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

8 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

8 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

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

* commit '569abcec45795c141c4883ac1939d44ee511d539':
  Camera: update video stabilization API doc.

Change-Id: I72ecf216ead1017c525065bdc0d78955afc587da

8 years agoCamera: fix typo in dynamic black level
Yin-Chia Yeh [Wed, 27 Apr 2016 21:10:35 +0000 (21:10 +0000)]
Camera: fix typo in dynamic black level
am: ad1304d

* commit 'ad1304d32a8da0bd122bafd5a26f4bd0e6daec5f':
  Camera: fix typo in dynamic black level

Change-Id: I2409ae20c619a54000f4d47b8e2442fa2bfac70e

8 years agoCamera: fix typo in dynamic black level
Yin-Chia Yeh [Tue, 26 Apr 2016 21:01:50 +0000 (14:01 -0700)]
Camera: fix typo in dynamic black level

Dynamic black level should be a capture result key.

Bug: 28276885
Change-Id: Ic70b64204251d046bc3ad17048b6a9c17ee9a174

8 years agoCamera: update FPS range spec
Yin-Chia Yeh [Tue, 26 Apr 2016 14:46:04 +0000 (14:46 +0000)]
Camera: update FPS range spec
am: 206bf4d

* commit '206bf4de57f9d85cfacbb8d919fd6960d3573be7':
  Camera: update FPS range spec

Change-Id: I35dbe59718ce37ae39ca5a98a7c96443697f5592

8 years agoCamera: Documentation updates
Eino-Ville Talvala [Tue, 26 Apr 2016 14:46:04 +0000 (14:46 +0000)]
Camera: Documentation updates
am: 62cfd97

* commit '62cfd97078f527b67a401ca4e5a97d33a16eacb5':
  Camera: Documentation updates

Change-Id: Ica0dba21eafd0a71cb1fc2210243911e26e9a67b

8 years agoCamera: update video stabilization API doc.
Jianing Wei [Tue, 26 Apr 2016 14:46:03 +0000 (14:46 +0000)]
Camera: update video stabilization API doc.
am: 161c29c

* commit '161c29c09f9c24f21d75f7e809b664b7a4cd39a3':
  Camera: update video stabilization API doc.

Change-Id: Ib21db0fe442a450c937b13597fb21fda6e67f0b1

8 years agoDocument special audio session values
Glenn Kasten [Tue, 19 Apr 2016 14:58:40 +0000 (14:58 +0000)]
Document special audio session values
am: 45afd61

* commit '45afd619058eefebd9100ce50f67a8fa5f9c45ae':
  Document special audio session values

Change-Id: I2405ac838971580410aa0a9891eb76dee613ec1e

8 years agoDocument special audio session values
Glenn Kasten [Mon, 18 Apr 2016 16:11:57 +0000 (09:11 -0700)]
Document special audio session values

don't need to have use == AUDIO_UNIQUE_ID_USE_SESSION

Bug: 28119934
Change-Id: I5b52616cc6ed53dfbaab422138112132fdae6bf1

8 years agoMerge "Camera: clarify lens shading map" into nyc-dev
Zhijun He [Thu, 14 Apr 2016 05:17:45 +0000 (05:17 +0000)]
Merge "Camera: clarify lens shading map" into nyc-dev

8 years agoCamera: add NDK metadata tag document
Yin-Chia Yeh [Wed, 6 Apr 2016 22:59:39 +0000 (15:59 -0700)]
Camera: add NDK metadata tag document

Bug: 27102995
Change-Id: Ieffc5825259614ffd5b46af013a043300d5214b1

8 years agoCamera: clarify lens shading map
Zhijun He [Wed, 13 Apr 2016 06:08:17 +0000 (23:08 -0700)]
Camera: clarify lens shading map

Lens shading correction should be full correction that
corrects both color shading and vignetting.

Bug: 18175853
Change-Id: Ia552345b2bd78b1b2eed2472096ebae80680d70b

8 years agoCamera: fix expectation of post RAW sensitivity control
Yin-Chia Yeh [Mon, 11 Apr 2016 23:37:49 +0000 (16:37 -0700)]
Camera: fix expectation of post RAW sensitivity control

1. Make postRawSensitivityBoost always available when RAW output
   is supported.
2. Fix one typo
3. Fix one codegen error in response to new visibility definition

Bug: 27950762
Change-Id: Ic023317cf915bec8cb5f4c0a4870287e1e7e51b5

8 years agoMerge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden...
Yin-Chia Yeh [Thu, 7 Apr 2016 22:33:36 +0000 (22:33 +0000)]
Merge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden-keys' into nyc-dev

* changes:
  Camera: hide some enum values in NDK
  Camera: codegen NDK metadata enum value documents
  Camera: modify metadata visibility attributes

8 years agoCamera: hide some enum values in NDK
Yin-Chia Yeh [Wed, 6 Apr 2016 18:58:41 +0000 (11:58 -0700)]
Camera: hide some enum values in NDK

Bug: 27102995
Change-Id: Ibcca0576f5e88c2e7a904c0d0699640c69005048

8 years agoCamera: codegen NDK metadata enum value documents
Yin-Chia Yeh [Mon, 4 Apr 2016 22:31:29 +0000 (15:31 -0700)]
Camera: codegen NDK metadata enum value documents

Bug: 27102995
Change-Id: I5fc2bbde479d28bae53b7459b5c78cfe8cf6fa80

8 years agoCamera: modify metadata visibility attributes
Yin-Chia Yeh [Sat, 2 Apr 2016 23:30:30 +0000 (16:30 -0700)]
Camera: modify metadata visibility attributes

So we can better describe whether a key should present in java or
native API.

Here are all possbile visibility values:
public      = visible in both Java/NDK public API
ndk_public  = visible in NDK API, @hide in java API
             (mostly source of synthethic keys)
java_public = visible in public java API, not present in NDK
             (mostly synthetic keys or features not supported
              in NDK)
hidden      = @hide in java API, not visible in NDK
system      = not defined in any API.

Bug: 27102995
Change-Id: Ib5163b0aba62126dfe3d72ec62a24136ce206b17

8 years agoSPDIF: Fix warnings from static analyser
Phil Burk [Wed, 6 Apr 2016 21:54:46 +0000 (14:54 -0700)]
SPDIF: Fix warnings from static analyser

Bug: 27230467
Change-Id: I89013d8b6696c6491db655ff2e1a3ceee9ffa3c8
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoMerge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev
Eino-Ville Talvala [Mon, 4 Apr 2016 19:38:51 +0000 (19:38 +0000)]
Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev

8 years agoCamera: Allow preview operation of SCENE_MODE_HDR
Eino-Ville Talvala [Mon, 4 Apr 2016 17:47:43 +0000 (10:47 -0700)]
Camera: Allow preview operation of SCENE_MODE_HDR

Some devices support HDR output for preview in addition to still
capture, so explicitly allow for that in the documentation of
SCENE_MODE_HDR.

Bug: 27313038
Change-Id: I76f3883b918bd3d81c8c03e0cee5d3dc7986bb25

8 years agoMerge "Camera: move path of camera device info" into nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 00:53:26 +0000 (00:53 +0000)]
Merge "Camera: move path of camera device info" into nyc-dev

8 years agoMerge "Camera: hide hidden NDK enum values" into nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 00:52:42 +0000 (00:52 +0000)]
Merge "Camera: hide hidden NDK enum values" into nyc-dev

8 years agoCamera: move path of camera device info
Yin-Chia Yeh [Sat, 2 Apr 2016 00:37:47 +0000 (17:37 -0700)]
Camera: move path of camera device info

CameraDeviceInfo.java is now in cts-device-info.

Bug: 27967489
Change-Id: I30451146f127d8388215977bda9f2d05ff1fd555