GitHub/LineageOS/android_hardware_samsung_slsi_exynos5.git
10 years agoam 565c46f8: am 5b1fd182: Merge "Remove #include <asm/page.h>."
Elliott Hughes [Wed, 30 Apr 2014 00:59:01 +0000 (00:59 +0000)]
am 565c46f8: am 5b1fd182: Merge "Remove #include <asm/page.h>."

* commit '565c46f8b714bca200cb5d55625a5154645196b4':

10 years agoam bb2255ab: am 0904c365: Don\'t advertise metadata mode for VP8 decoder.
Lajos Molnar [Fri, 21 Mar 2014 19:35:16 +0000 (19:35 +0000)]
am bb2255ab: am 0904c365: Don\'t advertise metadata mode for VP8 decoder.

* commit 'bb2255abfe61c47fe33fac2478becc70d5412796':
  Don't advertise metadata mode for VP8 decoder.

10 years agoam 0904c365: Don\'t advertise metadata mode for VP8 decoder.
Lajos Molnar [Fri, 21 Mar 2014 19:32:13 +0000 (19:32 +0000)]
am 0904c365: Don\'t advertise metadata mode for VP8 decoder.

* commit '0904c3659d032f759aa2877873e1fb335166435a':
  Don't advertise metadata mode for VP8 decoder.

10 years agoDon't advertise metadata mode for VP8 decoder.
Lajos Molnar [Thu, 13 Feb 2014 22:09:17 +0000 (14:09 -0800)]
Don't advertise metadata mode for VP8 decoder.

Disable metadata mode until android.media.cts.AdaptivePlaybackTest passes.

Bug: 11972823
Change-Id: I759fb94c91c9f9e8108ed30fa2a2861ffc25096a

10 years agoam 5b1fd182: Merge "Remove #include <asm/page.h>."
Elliott Hughes [Tue, 11 Mar 2014 00:52:53 +0000 (00:52 +0000)]
am 5b1fd182: Merge "Remove #include <asm/page.h>."

* commit '5b1fd1826dc8f13a26390f42190093c366aac01e':
  Remove #include <asm/page.h>.

10 years agoam 5b1fd182: Merge "Remove #include <asm/page.h>."
Elliott Hughes [Tue, 25 Feb 2014 00:34:37 +0000 (00:34 +0000)]
am 5b1fd182: Merge "Remove #include <asm/page.h>."

* commit '5b1fd1826dc8f13a26390f42190093c366aac01e':
  Remove #include <asm/page.h>.

10 years agoMerge "Remove #include <asm/page.h>."
Elliott Hughes [Tue, 25 Feb 2014 00:29:17 +0000 (00:29 +0000)]
Merge "Remove #include <asm/page.h>."

10 years agoRemove #include <asm/page.h>.
Elliott Hughes [Tue, 25 Feb 2014 00:28:31 +0000 (16:28 -0800)]
Remove #include <asm/page.h>.

Change-Id: I29a9f289cc053aaf017aa316bc9232885139e0e4

10 years agoam cd277b44: am e6c4cd2f: Merge "exynos: gralloc: replace struct ion_handle with...
Colin Cross [Thu, 19 Dec 2013 22:24:58 +0000 (22:24 +0000)]
am cd277b44: am e6c4cd2f: Merge "exynos: gralloc: replace struct ion_handle with ion_user_handle_t"

* commit 'cd277b441029619a0d6dc7dfad7025c2c971d1ee':
  exynos: gralloc: replace struct ion_handle with ion_user_handle_t

10 years agoam e6c4cd2f: Merge "exynos: gralloc: replace struct ion_handle with ion_user_handle_t"
Colin Cross [Thu, 19 Dec 2013 22:19:07 +0000 (14:19 -0800)]
am e6c4cd2f: Merge "exynos: gralloc: replace struct ion_handle with ion_user_handle_t"

* commit 'e6c4cd2f1e766609ee5ae538c5c78907d8313cb9':
  exynos: gralloc: replace struct ion_handle with ion_user_handle_t

10 years agoMerge "exynos: gralloc: replace struct ion_handle with ion_user_handle_t"
Colin Cross [Thu, 19 Dec 2013 22:14:16 +0000 (22:14 +0000)]
Merge "exynos: gralloc: replace struct ion_handle with ion_user_handle_t"

10 years agoexynos: gralloc: replace struct ion_handle with ion_user_handle_t
Rom Lemarchand [Thu, 24 Oct 2013 18:22:55 +0000 (11:22 -0700)]
exynos: gralloc: replace struct ion_handle with ion_user_handle_t

Replace struct ion_handle with ion_user_handle_t to match new kernel headers

Change-Id: Iefff2036f01dccbd47f0f0e6eef09e804e1e2ea0

10 years agoam b39943bf: am a61de09c: Merge "Move videodev2.h to include/linux."
Christopher Ferris [Mon, 16 Dec 2013 08:00:34 +0000 (08:00 +0000)]
am b39943bf: am a61de09c: Merge "Move videodev2.h to include/linux."

* commit 'b39943bf1902f5ff6967f55721066f787465f035':
  Move videodev2.h to include/linux.

10 years agoam a61de09c: Merge "Move videodev2.h to include/linux."
Christopher Ferris [Mon, 16 Dec 2013 07:56:14 +0000 (23:56 -0800)]
am a61de09c: Merge "Move videodev2.h to include/linux."

* commit 'a61de09c54ec0e38863639d216392acc6fcc311c':
  Move videodev2.h to include/linux.

10 years agoMerge "Move videodev2.h to include/linux."
Christopher Ferris [Mon, 16 Dec 2013 07:51:18 +0000 (07:51 +0000)]
Merge "Move videodev2.h to include/linux."

10 years agoMove videodev2.h to include/linux.
Christopher Ferris [Wed, 4 Dec 2013 22:53:23 +0000 (14:53 -0800)]
Move videodev2.h to include/linux.

Modify all places that include the local header file videodev2.h to
change to include linux/videodev2.h. This is a special version of a kernel
header file that needs to override the one found in the bionic kernel
headers.

(cherry picked from commit a04d7d81f57932ecd1e35be21d2d6d1210f26d19)

Change-Id: I4e5db11d5434d3efede5cd93c93bc3f55dfe01f1

10 years agoDO NOT MERGE reset to goog/klp-volantis-dev
Qiwen Zhao [Mon, 9 Dec 2013 22:19:36 +0000 (14:19 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev

10 years agoam e5a9bc4a: am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b...
The Android Open Source Project [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am e5a9bc4a: am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b\' into HEAD

* commit 'e5a9bc4aa309d0989b2663a8f49d0b2661bcf81f':

10 years agoam 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858...
The Android Open Source Project [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD

* commit '84a0fc9c00d5fa6facbd26eac7da00c58cea87a9':

10 years agoam de9b6a49: am 070e4486: Merge "mobicore: do not use GNU old-style field designators"
Nick Kralevich [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am de9b6a49: am 070e4486: Merge "mobicore: do not use GNU old-style field designators"

* commit 'de9b6a49620d14c09bc95a1b80e9c5496cf4029b':
  mobicore: do not use GNU old-style field designators

10 years agoam 504c5d9c: am a883fe8d: merge in klp-release (no-op)
Ed Heyl [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am 504c5d9c: am a883fe8d: merge in klp-release (no-op)

* commit '504c5d9c6e05cecabcb2404a2fd1a05259602858':

10 years agoam ad73045f: am a3bcc37b: libcamera2: Video Stabilization Killswitch
Alex Ray [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am ad73045f: am a3bcc37b: libcamera2: Video Stabilization Killswitch

* commit 'ad73045fa524976ad55b95edc89b46c37ef08273':

10 years agoam 049dc0cc: am 4ed83a2b: merge in KQS81M
Ed Heyl [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am 049dc0cc: am 4ed83a2b: merge in KQS81M

* commit '049dc0cc7f54707f8759ba07cae4f18d902686b4':

10 years agoam 9dc5f4f7: am 87710506: Merge "libcamera2: Static characteristic metadata fixes...
Alex Ray [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am 9dc5f4f7: am 87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev

* commit '9dc5f4f7212c37eac1801eb0d3d14f6524e22708':

10 years agoam e6a4b5d8: am a6302fad: libcamera2: new return code when camera in use
Alex Ray [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am e6a4b5d8: am a6302fad: libcamera2: new return code when camera in use

* commit 'e6a4b5d8a9ab44f52c73fd032445eb7fcffe1416':

10 years agoam 646e2287: am 30f3ec95: libcamera2: Add exposure time to default request
Alex Ray [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am 646e2287: am 30f3ec95: libcamera2: Add exposure time to default request

* commit '646e2287cdcec6596e723c999d324a3dad642a9f':

10 years agoam a9911a58: am c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale
Greg Hackmann [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am a9911a58: am c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale

* commit 'a9911a58520a0defc2e1628c6932cd67e6260736':

10 years agoam 0c218aca: am d03ee772: Merge "Restore overlay support for RGB565 layers" into...
Jesse Hall [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am 0c218aca: am d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev

* commit '0c218acabced1726f66b3a19f88e20460cc96547':

10 years agoam 2fc43c35: am ff33d0b2: Merge "libcamera2: fix test crash issue due to garbage...
Zhijun He [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am 2fc43c35: am ff33d0b2: Merge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev

* commit '2fc43c35b61cc3a88cd883aab0f8fbff0442472d':

10 years agoam db543703: am a4863a2a: libcamera2: hardwareSupportedLevel should be limited
Zhijun He [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am db543703: am a4863a2a: libcamera2: hardwareSupportedLevel should be limited

* commit 'db54370366ac839386858e0c94079cab2e5d6157':

10 years agoam e7b90726: am 24b40bec: exynos_omx: multi_thread: Fix CodecReconfig issue.
SeungBeom Kim [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am e7b90726: am 24b40bec: exynos_omx: multi_thread: Fix CodecReconfig issue.

* commit 'e7b9072624866e733020dfdff8c77f201c3a24dd':

10 years agoam abe4b6d8: am bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change...
SeungBeom Kim [Fri, 6 Dec 2013 21:04:23 +0000 (21:04 +0000)]
am abe4b6d8: am bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.

* commit 'abe4b6d876ec331003a6759e287f803bd0a72c13':

10 years agoam 4a13c150: am 30a4fead: Merge "Use canonical UniquePtr.h header"
Kenny Root [Fri, 6 Dec 2013 21:04:23 +0000 (21:04 +0000)]
am 4a13c150: am 30a4fead: Merge "Use canonical UniquePtr.h header"

* commit '4a13c150ffe58c53148bab8db32e647ef4e535e7':
  Use canonical UniquePtr.h header

10 years agoam 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b\' into HEAD
The Android Open Source Project [Fri, 6 Dec 2013 01:25:48 +0000 (17:25 -0800)]
am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b\' into HEAD

* commit '2dc79df2f22e7fa57599a39e7a17b25f92dbdf91':

10 years agoMerge commit 'de9b6a49620d14c09bc95a1b80e9c5496cf4029b' into HEAD
The Android Open Source Project [Thu, 5 Dec 2013 20:38:21 +0000 (12:38 -0800)]
Merge commit 'de9b6a49620d14c09bc95a1b80e9c5496cf4029b' into HEAD

11 years agoam e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD
The Android Open Source Project [Sat, 23 Nov 2013 01:40:44 +0000 (17:40 -0800)]
am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD

* commit 'e83cfe6980e7d8796bbe60ca46bad4342297ab99':

11 years agoMerge commit '504c5d9c6e05cecabcb2404a2fd1a05259602858' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 18:35:28 +0000 (10:35 -0800)]
Merge commit '504c5d9c6e05cecabcb2404a2fd1a05259602858' into HEAD

11 years agoam 070e4486: Merge "mobicore: do not use GNU old-style field designators"
Nick Kralevich [Tue, 12 Nov 2013 23:22:32 +0000 (15:22 -0800)]
am 070e4486: Merge "mobicore: do not use GNU old-style field designators"

* commit '070e4486c463244679631eb3f3692619f2f80f11':
  mobicore: do not use GNU old-style field designators

11 years agoMerge "mobicore: do not use GNU old-style field designators"
Nick Kralevich [Tue, 12 Nov 2013 23:14:12 +0000 (23:14 +0000)]
Merge "mobicore: do not use GNU old-style field designators"

11 years agomobicore: do not use GNU old-style field designators
synergy dev [Tue, 12 Nov 2013 01:54:09 +0000 (17:54 -0800)]
mobicore: do not use GNU old-style field designators

Avoiding the use of gnu extensions improves code portability

Change-Id: I0523b67dc649633f5e019d3e9b8af974251b9974

11 years agoam a883fe8d: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:56:27 +0000 (17:56 -0700)]
am a883fe8d: merge in klp-release (no-op)

* commit 'a883fe8d91dbcf3bde791e5810338fcb4ee8aca5':

11 years agomerge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:44:24 +0000 (17:44 -0700)]
merge in klp-release (no-op)

11 years agoam a3bcc37b: libcamera2: Video Stabilization Killswitch
Alex Ray [Tue, 15 Oct 2013 23:16:47 +0000 (16:16 -0700)]
am a3bcc37b: libcamera2: Video Stabilization Killswitch

* commit 'a3bcc37bef2d394aaf9651686b72a7d0a74da7b0':
  libcamera2: Video Stabilization Killswitch

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 22:55:44 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev

11 years agolibcamera2: Video Stabilization Killswitch
Alex Ray [Tue, 15 Oct 2013 06:27:33 +0000 (23:27 -0700)]
libcamera2: Video Stabilization Killswitch

Bug: 10819643
Change-Id: I6fc3478308aaaca3ebecbd7f1fe71404554917d1

11 years agoam 4ed83a2b: merge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:57:55 +0000 (15:57 -0700)]
am 4ed83a2b: merge in KQS81M

* commit '4ed83a2b6839be1c7b45db8ed8d54250f00fb65d':
  *HACK* assume android requests 1 more buffer then we specify

11 years agomerge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:41:54 +0000 (15:41 -0700)]
merge in KQS81M

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 6 Oct 2013 13:01:37 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoam 87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev
Alex Ray [Thu, 3 Oct 2013 23:02:10 +0000 (16:02 -0700)]
am 87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev

* commit '877105063c2a4f9050ea899fcff3843f39050ec6':
  libcamera2: Static characteristic metadata fixes

11 years agoMerge "libcamera2: Static characteristic metadata fixes" into klp-dev
Alex Ray [Thu, 3 Oct 2013 22:56:27 +0000 (22:56 +0000)]
Merge "libcamera2: Static characteristic metadata fixes" into klp-dev

11 years agoam a6302fad: libcamera2: new return code when camera in use
Alex Ray [Wed, 2 Oct 2013 16:36:40 +0000 (09:36 -0700)]
am a6302fad: libcamera2: new return code when camera in use

* commit 'a6302fad7a2d78736ae39a341b6f3468b9c6f5a3':
  libcamera2: new return code when camera in use

11 years agoam 30f3ec95: libcamera2: Add exposure time to default request
Alex Ray [Wed, 2 Oct 2013 16:36:39 +0000 (09:36 -0700)]
am 30f3ec95: libcamera2: Add exposure time to default request

* commit '30f3ec95f62e0a6998d87f909844eb332c7b66e7':
  libcamera2: Add exposure time to default request

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 2 Oct 2013 13:01:23 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

11 years agolibcamera2: new return code when camera in use
Alex Ray [Mon, 30 Sep 2013 17:26:24 +0000 (10:26 -0700)]
libcamera2: new return code when camera in use

Bug: 10838065
Change-Id: I7f3e447a2082b8102968137ed0eee59de5d0de55

11 years agolibcamera2: Add exposure time to default request
Alex Ray [Mon, 30 Sep 2013 17:19:21 +0000 (10:19 -0700)]
libcamera2: Add exposure time to default request

Bug: 10837491
Change-Id: I0ec0850cabb4aef76ed97a14838594ed3f549266

11 years agoam c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale
Greg Hackmann [Tue, 1 Oct 2013 00:08:24 +0000 (17:08 -0700)]
am c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale

* commit 'c0b4a4f1a8b088964ded32dfee294b9199c71534':
  hwc: do not allow gsc downscaling by exactly max_downscale

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 29 Sep 2013 13:01:25 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

11 years agohwc: do not allow gsc downscaling by exactly max_downscale
Greg Hackmann [Fri, 27 Sep 2013 17:23:41 +0000 (10:23 -0700)]
hwc: do not allow gsc downscaling by exactly max_downscale

The Gscaler registers do not have enough bits to represent downscaling
by exactly 16x

Bug: 10946861

Change-Id: I6a9921193d9188bca2344815c29863c550c5e3dd
Signed-off-by: Greg Hackmann <ghackmann@google.com>
11 years agolibcamera2: Static characteristic metadata fixes
Alex Ray [Thu, 26 Sep 2013 21:06:42 +0000 (14:06 -0700)]
libcamera2: Static characteristic metadata fixes

Bug: 10838063
Change-Id: I28b841bda396312c0a2999cd5844640527a9fc77

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 24 Sep 2013 13:01:22 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoam d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev
Jesse Hall [Tue, 24 Sep 2013 02:00:39 +0000 (19:00 -0700)]
am d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev

* commit 'd03ee77200600d35e18055b8cea259c613ffcfa1':
  Restore overlay support for RGB565 layers

11 years agoam ff33d0b2: Merge "libcamera2: fix test crash issue due to garbage function pointer...
Zhijun He [Tue, 24 Sep 2013 02:00:01 +0000 (19:00 -0700)]
am ff33d0b2: Merge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev

* commit 'ff33d0b29cb23eeabc3629f24584dc8dc5f2267a':
  libcamera2: fix test crash issue due to garbage function pointer.

11 years agoam a4863a2a: libcamera2: hardwareSupportedLevel should be limited
Zhijun He [Tue, 24 Sep 2013 01:59:52 +0000 (18:59 -0700)]
am a4863a2a: libcamera2: hardwareSupportedLevel should be limited

* commit 'a4863a2a81c6c3bbb3600e41c9847a10f4e6e96d':
  libcamera2: hardwareSupportedLevel should be limited

11 years agoMerge "Restore overlay support for RGB565 layers" into klp-dev
Jesse Hall [Mon, 23 Sep 2013 23:38:17 +0000 (23:38 +0000)]
Merge "Restore overlay support for RGB565 layers" into klp-dev

11 years agoRestore overlay support for RGB565 layers
Jesse Hall [Mon, 23 Sep 2013 23:07:31 +0000 (16:07 -0700)]
Restore overlay support for RGB565 layers

This was accidentally removed by change-id
  I2b0eb35344631d162b30dd22ee0ad7651f22e6fa
which removed HAL formats 5551 and 4444.

Bug: 10748683
Change-Id: Id610083732f0495a7c4a29660c7c2c8750929510

11 years agoMerge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev
Zhijun He [Mon, 23 Sep 2013 21:30:00 +0000 (21:30 +0000)]
Merge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev

11 years agolibcamera2: fix test crash issue due to garbage function pointer.
Zhijun He [Thu, 19 Sep 2013 22:11:00 +0000 (15:11 -0700)]
libcamera2: fix test crash issue due to garbage function pointer.

Bug: 10838065
Change-Id: I89e2044f57e8588d6e7024e22a633ebe37d5a37f

11 years agolibcamera2: hardwareSupportedLevel should be limited
Zhijun He [Mon, 23 Sep 2013 17:03:03 +0000 (10:03 -0700)]
libcamera2: hardwareSupportedLevel should be limited

Bug: 10388724
Change-Id: I564e8c5860aa322d3f5261e027f8ffcf3a02974a

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 19 Sep 2013 13:01:58 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoam 24b40bec: exynos_omx: multi_thread: Fix CodecReconfig issue.
SeungBeom Kim [Thu, 19 Sep 2013 00:06:25 +0000 (17:06 -0700)]
am 24b40bec: exynos_omx: multi_thread: Fix CodecReconfig issue.

* commit '24b40bec52d792aa9907d5b76fbb66ebc15a56ed':
  exynos_omx: multi_thread: Fix CodecReconfig issue.

11 years agoam bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
SeungBeom Kim [Thu, 19 Sep 2013 00:06:25 +0000 (17:06 -0700)]
am bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.

* commit 'bd09b8148180c902648b5ac57d024f457f852efa':
  exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.

11 years agoam 30a4fead: Merge "Use canonical UniquePtr.h header"
Kenny Root [Wed, 18 Sep 2013 19:05:24 +0000 (12:05 -0700)]
am 30a4fead: Merge "Use canonical UniquePtr.h header"

* commit '30a4fead6c0dc70dff115ac9d9f79ac7c4646fde':
  Use canonical UniquePtr.h header

11 years agoexynos_omx: multi_thread: Fix CodecReconfig issue.
SeungBeom Kim [Tue, 17 Sep 2013 00:39:46 +0000 (09:39 +0900)]
exynos_omx: multi_thread: Fix CodecReconfig issue.

Change-Id: I60494d236ca458c90d6b2a64c19980688517941d
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10728106

11 years agoexynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
SeungBeom Kim [Tue, 17 Sep 2013 01:03:40 +0000 (10:03 +0900)]
exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.

Change-Id: I302de465745513a29dcacb33fe623c3cad7f6b1d
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10192533

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 18 Sep 2013 04:11:35 +0000 (21:11 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoMerge "exynos_omx: multi_thread: Fix the return data length with EOS in meta data...
Lajos Molnar [Tue, 17 Sep 2013 22:54:23 +0000 (22:54 +0000)]
Merge "exynos_omx: multi_thread: Fix the return data length with EOS in meta data mode." into klp-dev

11 years agoFix compile warning
Colin Cross [Mon, 16 Sep 2013 22:17:01 +0000 (15:17 -0700)]
Fix compile warning

Use int instead of enum in the getMemory function definition.

Change-Id: I0d4928f382fb63639fca4409ab28ddfae625fc9f

11 years agoexynos_omx: multi_thread: Fix the return data length with EOS in meta data mode.
SeungBeom Kim [Mon, 16 Sep 2013 07:41:43 +0000 (16:41 +0900)]
exynos_omx: multi_thread: Fix the return data length with EOS in meta data mode.

Change-Id: Ia65b6da0e4ce6b4f8bbc4fa2ffaa8b8c359f2ad3
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10704989

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 16 Sep 2013 13:01:32 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoMerge "Initial memory tracker hal for exynos5" into klp-dev
Rom Lemarchand [Fri, 13 Sep 2013 18:24:46 +0000 (18:24 +0000)]
Merge "Initial memory tracker hal for exynos5" into klp-dev

11 years agoMerge "Use canonical UniquePtr.h header"
Kenny Root [Wed, 11 Sep 2013 21:50:06 +0000 (21:50 +0000)]
Merge "Use canonical UniquePtr.h header"

11 years agoUse canonical UniquePtr.h header
Kenny Root [Wed, 11 Sep 2013 21:47:32 +0000 (14:47 -0700)]
Use canonical UniquePtr.h header

Change-Id: Ic8f3263ad83c3cd3bf0f5a9c847ee26910afb616

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 10 Sep 2013 21:28:48 +0000 (14:28 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoMerge "Exynos5: Camera HAL v2: Increase the number of gralloc buffers in allocateStre...
Sasha Levitskiy [Tue, 10 Sep 2013 19:48:40 +0000 (19:48 +0000)]
Merge "Exynos5: Camera HAL v2: Increase the number of gralloc buffers in allocateStream()" into klp-dev

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 9 Sep 2013 13:02:02 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoInitial memory tracker hal for exynos5
Colin Cross [Fri, 6 Sep 2013 23:39:46 +0000 (16:39 -0700)]
Initial memory tracker hal for exynos5

Only tracks GL memory so far.

Bug: 10294768
Change-Id: I47d8ecd6e98f883878dbb32788739d63828a2459

11 years agolibcamera2: Fix stream id types
Zhijun He [Sat, 7 Sep 2013 00:52:02 +0000 (17:52 -0700)]
libcamera2: Fix stream id types

Bug: 10604704
Change-Id: Ie336eaf06693a33179625fc93defc7e878f630f7

11 years agoUse EVP_PKEY_get1_RSA to get RSA reference
Kenny Root [Fri, 6 Sep 2013 16:51:27 +0000 (09:51 -0700)]
Use EVP_PKEY_get1_RSA to get RSA reference

EVP_PKEY structures could be of any number of key types. Switch to
EVP_PKEY_get1_RSA because that will check that the key type before it
tries to pull out the RSA pointer. This prevents crashes when the key
type is not actually RSA.

Bug: 10647482
Change-Id: I6848db52b04ed11331138ac00f0796574a87fa6a

11 years agoExynos5: Camera HAL v2: Increase the number of gralloc buffers in allocateStream()
Sasha Levitskiy [Wed, 4 Sep 2013 22:42:06 +0000 (15:42 -0700)]
Exynos5: Camera HAL v2: Increase the number of gralloc buffers in allocateStream()

Bug: 10415750

Signed-off-by: Sasha Levitskiy <sanek@google.com>
Change-Id: Ic4a62619ff49617a0b56650f469e45a099ceeb5c

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 2 Sep 2013 13:01:25 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoRevert "exynos_omx: : fail storeMetaDataInBuffers on output port"
Lajos Molnar [Tue, 6 Aug 2013 18:54:04 +0000 (11:54 -0700)]
Revert "exynos_omx: : fail storeMetaDataInBuffers on output port"

Now that Samsung codec actually supports meta-data mode on video decoder
output port, revert earlier block.

Change-Id: I48a0af73d8c9a8ce0eb73e89e13021d0f2d7943b
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10192533

11 years agoexynos_omx: multi_thread: add Dynamic resolution change support code.
SeungBeom Kim [Thu, 1 Aug 2013 23:33:37 +0000 (08:33 +0900)]
exynos_omx: multi_thread: add Dynamic resolution change support code.

Added Dynamic resolution change to H.264 Component.

Change-Id: I73a2d1eaa3412199f886a9a4a4a046c234c06350
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10192533

11 years agoexynos_omx: multi_thread: Code clean up.
SeungBeom Kim [Fri, 2 Aug 2013 01:05:22 +0000 (10:05 +0900)]
exynos_omx: multi_thread: Code clean up.

for GED Code and S.LSI code synchronization.

Change-Id: I10f450cbd688a7802ade7bbb6e3623646611062b
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10192533

11 years agoexynos_omx: multi_thread: Add dynamic DPB change scheme.
SeungBeom Kim [Wed, 31 Jul 2013 04:46:35 +0000 (13:46 +0900)]
exynos_omx: multi_thread: Add dynamic DPB change scheme.

- Decode output port supported StoreMetaDataBuffer.
- Dynamic DPB change supported.

Change-Id: If23a5eb5cc6fef3781c4a45fb06fe7eab41b1b5b
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10192533

11 years agoexynos: add CID for dynamic DPB change scheme in video decoder output port.
SeungBeom Kim [Mon, 29 Jul 2013 22:50:12 +0000 (07:50 +0900)]
exynos: add CID for dynamic DPB change scheme in video decoder output port.

Change-Id: I90161a9c269fcde31723d66b72b661a1417a1981
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10192533

11 years agoexynos: add API for reference count of ion fd.
SeungBeom Kim [Mon, 29 Jul 2013 22:41:12 +0000 (07:41 +0900)]
exynos: add API for reference count of ion fd.

Change-Id: I93e8807ff4a66203c763071bccfcffbfac0463e4
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10192533

11 years agoexynos_omx: multi_thread: Add ThumbnailMode decoding.
SeungBeom Kim [Thu, 13 Jun 2013 03:17:56 +0000 (12:17 +0900)]
exynos_omx: multi_thread: Add ThumbnailMode decoding.

Extension name:
 - EXYNOS_INDEX_PARAM_ENABLE_THUMBNAIL "OMX.SEC.index.enableThumbnailMode"

if you want enable thumbnail decoding,
Use SetParameter and EXYNOS_OMX_VIDEO_THUMBNAILMODE struct.

typedef struct _EXYNOS_OMX_VIDEO_THUMBNAILMODE {
    OMX_U32 nSize;
    OMX_VERSIONTYPE nVersion;
    OMX_U32 nPortIndex;
    OMX_BOOL bEnable;
} EXYNOS_OMX_VIDEO_THUMBNAILMODE;

Change-Id: I199f286bfbd35266b6f319538a55e64a71070f8e
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10192533

11 years agoexynos_omx: multi_thread: Added prependSPSPPSToIDRFrames to support the expansion...
SeungBeom Kim [Tue, 4 Jun 2013 07:37:06 +0000 (16:37 +0900)]
exynos_omx: multi_thread: Added prependSPSPPSToIDRFrames to support the expansion of Google.

When using "OMX.google.android.index.prependSPSPPSToIDRFrames" extension index,
support prepending SPS/PPS at every IDR/I frame.

Change-Id: Idf6669708d627ede013f053de9c8bfaa78181675
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug: 10192533

11 years agoMerge "exynos_omx: multi_thread: Increase default buffer size for copy mode recording...
Greg Hackmann [Thu, 29 Aug 2013 21:43:01 +0000 (21:43 +0000)]
Merge "exynos_omx: multi_thread: Increase default buffer size for copy mode recording." into klp-dev

11 years agogralloc: use BGRA byte order for video encoder targets
Greg Hackmann [Thu, 29 Aug 2013 17:24:35 +0000 (10:24 -0700)]
gralloc: use BGRA byte order for video encoder targets

Encoder does not recognize RGBA byte order, so refuse to allocate if SW
usage flags are set

Bug: 10429036

Change-Id: I3b9d0e71566c3565068b7c38c4f9189f4bb93fd0
Signed-off-by: Greg Hackmann <ghackmann@google.com>