Zhijun He [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
db543703: am
a4863a2a: libcamera2: hardwareSupportedLevel should be limited
* commit '
db54370366ac839386858e0c94079cab2e5d6157':
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':
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':
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
Ed Heyl [Thu, 17 Oct 2013 00:44:24 +0000 (17:44 -0700)]
merge in klp-release (no-op)
The Android Automerger [Tue, 15 Oct 2013 22:55:44 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev
Alex Ray [Tue, 15 Oct 2013 06:27:33 +0000 (23:27 -0700)]
libcamera2: Video Stabilization Killswitch
Bug:
10819643
Change-Id: I6fc3478308aaaca3ebecbd7f1fe71404554917d1
Ed Heyl [Tue, 8 Oct 2013 22:41:54 +0000 (15:41 -0700)]
merge in KQS81M
The Android Automerger [Sun, 6 Oct 2013 13:01:37 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Alex Ray [Thu, 3 Oct 2013 22:56:27 +0000 (22:56 +0000)]
Merge "libcamera2: Static characteristic metadata fixes" into 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
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
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
The Android Automerger [Sun, 29 Sep 2013 13:01:25 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
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>
Alex Ray [Thu, 26 Sep 2013 21:06:42 +0000 (14:06 -0700)]
libcamera2: Static characteristic metadata fixes
Bug:
10838063
Change-Id: I28b841bda396312c0a2999cd5844640527a9fc77
The Android Automerger [Tue, 24 Sep 2013 13:01:22 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
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
Jesse Hall [Mon, 23 Sep 2013 23:38:17 +0000 (23:38 +0000)]
Merge "Restore overlay support for RGB565 layers" into klp-dev
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
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
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
Zhijun He [Mon, 23 Sep 2013 17:03:03 +0000 (10:03 -0700)]
libcamera2: hardwareSupportedLevel should be limited
Bug:
10388724
Change-Id: I564e8c5860aa322d3f5261e027f8ffcf3a02974a
The Android Automerger [Thu, 19 Sep 2013 13:01:58 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
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.
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.
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
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
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
The Android Automerger [Wed, 18 Sep 2013 04:11:35 +0000 (21:11 -0700)]
merge in klp-release history after reset to klp-dev
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
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
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
The Android Automerger [Mon, 16 Sep 2013 13:01:32 +0000 (06:01 -0700)]
merge in klp-release history after reset to 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
Kenny Root [Wed, 11 Sep 2013 21:50:06 +0000 (21:50 +0000)]
Merge "Use 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
The Android Automerger [Tue, 10 Sep 2013 21:28:48 +0000 (14:28 -0700)]
merge in klp-release history after reset to klp-dev
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
The Android Automerger [Mon, 9 Sep 2013 13:02:02 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
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
Zhijun He [Sat, 7 Sep 2013 00:52:02 +0000 (17:52 -0700)]
libcamera2: Fix stream id types
Bug:
10604704
Change-Id: Ie336eaf06693a33179625fc93defc7e878f630f7
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
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
The Android Automerger [Mon, 2 Sep 2013 13:01:25 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
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
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
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
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
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
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
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
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
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
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>
The Android Automerger [Thu, 29 Aug 2013 13:01:11 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Greg Hackmann [Wed, 28 Aug 2013 00:14:27 +0000 (17:14 -0700)]
gralloc: use BGRA byte order for framebuffer target
Bug:
10429036
Change-Id: Idac73fd588cca70e075c017af00dd590b14b0c7e
Signed-off-by: Greg Hackmann <ghackmann@google.com>
SeungBeom Kim [Mon, 26 Aug 2013 04:00:35 +0000 (13:00 +0900)]
exynos_omx: multi_thread: Increase default buffer size for copy mode recording.
Bug:
10307151
Change-Id: Ie2627d571dff7ee1d5e3ce86839d20b681aac200
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Lajos Molnar [Thu, 1 Aug 2013 20:20:12 +0000 (13:20 -0700)]
*HACK* assume android requests 1 more buffer then we specify
This used to be usually 2, but for synchronous surfaces that are
used most commonly, it is now 1.
The proper fix would be to allow android to request arbitrarily
more buffers than we specify to account for different buffer
consumer requirements, but that does not work with current code
base.
Change-Id: Ieeafda28b547343d420e7b74e0e5c4a7033673b8
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9970482
Lajos Molnar [Thu, 1 Aug 2013 20:20:12 +0000 (13:20 -0700)]
*HACK* assume android requests 1 more buffer then we specify
This used to be usually 2, but for synchronous surfaces that are
used most commonly, it is now 1.
The proper fix would be to allow android to request arbitrarily
more buffers than we specify to account for different buffer
consumer requirements, but that does not work with current code
base.
Change-Id: Ieeafda28b547343d420e7b74e0e5c4a7033673b8
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9970482
Mathias Agopian [Fri, 26 Jul 2013 21:50:14 +0000 (14:50 -0700)]
get rid of HAL pixelformats 5551 and 4444
Change-Id: I2b0eb35344631d162b30dd22ee0ad7651f22e6fa
Zhijun He [Thu, 18 Jul 2013 01:06:25 +0000 (18:06 -0700)]
Camera2: Update static camera metadata
Change-Id: Ia2ad2879446e3e03e9c120f38d5d68ed6d35231d
Lajos Molnar [Fri, 12 Jul 2013 19:31:26 +0000 (12:31 -0700)]
Update VP8 component role
VP8 component role changed to "video_decoder.vp8" in the framework.
Change-Id: Icba81db7ae921df321e2426ca426b3eaf13fbb98
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9759512
The Android Open Source Project [Thu, 6 Jun 2013 17:43:05 +0000 (10:43 -0700)]
am
86dc75dc: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
86dc75dcb45880832dc125d2f38dce4ca63a1e78':
libcamera2: add hardwareLevel to camera metadata
The Android Open Source Project [Thu, 6 Jun 2013 17:37:30 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Id19e45c1de96766e22fa6e721c864214ba233fd6
The Android Automerger [Wed, 5 Jun 2013 17:17:51 +0000 (10:17 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Alex Ray [Mon, 3 Jun 2013 20:23:34 +0000 (13:23 -0700)]
libcamera2: add hardwareLevel to camera metadata
Technically, this is only required for v3 and higher devices, and this
is a v2 device. There aren't any other v2 devices, so our framework
logic just treats them the same. Adding this metadata entry puts this
device back as a first-class full (v3) device in the framework.
Bug:
9261359
Change-Id: I4ba91c5689fd17d4a3f2044fae1c39dd9ee625df
Alex Ray [Tue, 4 Jun 2013 00:16:35 +0000 (17:16 -0700)]
am
b10d106f: am
05c0c1a4: libcamera2: add hardwareLevel to camera metadata
* commit '
b10d106f6e991177020c318ffb9d0fb0cca3eddc':
libcamera2: add hardwareLevel to camera metadata
Alex Ray [Tue, 4 Jun 2013 00:03:58 +0000 (17:03 -0700)]
am
05c0c1a4: libcamera2: add hardwareLevel to camera metadata
* commit '
05c0c1a4b70392cf7a8a3fd7d12f99e597a3e996':
libcamera2: add hardwareLevel to camera metadata
Alex Ray [Mon, 3 Jun 2013 20:23:34 +0000 (13:23 -0700)]
libcamera2: add hardwareLevel to camera metadata
Technically, this is only required for v3 and higher devices, and this
is a v2 device. There aren't any other v2 devices, so our framework
logic just treats them the same. Adding this metadata entry puts this
device back as a first-class full (v3) device in the framework.
Bug:
9261359
Change-Id: I4ba91c5689fd17d4a3f2044fae1c39dd9ee625df
Christopher Ferris [Thu, 23 May 2013 21:38:15 +0000 (14:38 -0700)]
am
81f2b4af: am
d5d1a4e8: Merge "Fix missing argument."
* commit '
81f2b4af7e151709230e80d690b454783efd3809':
Fix missing argument.
Christopher Ferris [Thu, 23 May 2013 21:32:03 +0000 (14:32 -0700)]
am
d5d1a4e8: Merge "Fix missing argument."
* commit '
d5d1a4e8e844e806c48d99d0ecfd2ff37bd253ed':
Fix missing argument.
Christopher Ferris [Thu, 23 May 2013 20:26:01 +0000 (20:26 +0000)]
Merge "Fix missing argument."
Christopher Ferris [Fri, 3 May 2013 23:58:30 +0000 (16:58 -0700)]
Fix missing argument.
Merge from internal master.
(cherry-picked from
32c3b671851f36604c616030365e6047257998c2)
Change-Id: Ibbdba220eb3f79505eac5aa810f942a76a0f49d9
Christopher Ferris [Fri, 3 May 2013 23:58:30 +0000 (16:58 -0700)]
Fix missing argument.
Change-Id: Ic067f205acb379aa112db6adc717b53d3e79db22
Chong Zhang [Mon, 20 May 2013 20:18:00 +0000 (20:18 +0000)]
Merge "exynos_omx: : fail storeMetaDataInBuffers on output port"
The Android Open Source Project [Mon, 20 May 2013 15:26:24 +0000 (08:26 -0700)]
am
e15285c1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
e15285c1fa96c9e3c3dacbe8f1a2e25b7be299f1':
Camera: Fix green JPEGs
The Android Open Source Project [Mon, 20 May 2013 15:20:32 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I388b86949eef906330343df9a5b3166d0c21d743
Eino-Ville Talvala [Fri, 17 May 2013 00:33:06 +0000 (17:33 -0700)]
Camera: Fix green JPEGs
Need crop regions to be 4 entries on the input and the output; otherwise
the sanity checks when doing reprocessing will reject the HAL's own output.
Bug:
8947463
Change-Id: I0be0ac816cb65c802c3a5ae56af732edf9145edc
The Android Open Source Project [Fri, 17 May 2013 19:59:38 +0000 (12:59 -0700)]
am
27b4511d: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
27b4511d4bee1ae302de2af0fd14c6b7361a7590':
The Android Open Source Project [Fri, 17 May 2013 19:54:40 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ie94a2d958b0a91e2ea0e0c48a91b4092f6fab942
Eino-Ville Talvala [Fri, 17 May 2013 03:50:45 +0000 (20:50 -0700)]
am
a44d2d1e: am
39ed5163: Camera: Fix green JPEGs
* commit '
a44d2d1e3a66d93b2be5bb11ab05b886d70099d1':
Camera: Fix green JPEGs
Eino-Ville Talvala [Fri, 17 May 2013 03:45:45 +0000 (20:45 -0700)]
am
39ed5163: Camera: Fix green JPEGs
* commit '
39ed516364d4f0b2648113cb3f94533e86c2da95':
Camera: Fix green JPEGs
Eino-Ville Talvala [Fri, 17 May 2013 00:33:06 +0000 (17:33 -0700)]
Camera: Fix green JPEGs
Need crop regions to be 4 entries on the input and the output; otherwise
the sanity checks when doing reprocessing will reject the HAL's own output.
Bug:
8947463
Change-Id: I0be0ac816cb65c802c3a5ae56af732edf9145edc
The Android Automerger [Thu, 16 May 2013 12:55:38 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 16 May 2013 12:48:21 +0000 (05:48 -0700)]
am
38d9ff02: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
38d9ff020b56bd7b1dfcbfa9f5c0185271bc08c8':
The Android Open Source Project [Thu, 16 May 2013 12:43:56 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iec327c611f56804aeddd1a4310e967b9fd6c7467
Chong Zhang [Wed, 15 May 2013 22:45:11 +0000 (15:45 -0700)]
exynos_omx: : fail storeMetaDataInBuffers on output port
Metadata mode is not supported yet on output port.
Bug:
8987541
Change-Id: Ia9b88ee9e4535194b40dca143a188ad19af36ccc
Dmitry Shmidt [Wed, 15 May 2013 21:06:51 +0000 (14:06 -0700)]
am
612b1be6: am
25bee067: exynos_omx: Increase number of video resources
* commit '
612b1be67e8b13f2ab66f86f6d279133411d237a':
exynos_omx: Increase number of video resources
Dmitry Shmidt [Wed, 15 May 2013 20:35:20 +0000 (13:35 -0700)]
am
25bee067: exynos_omx: Increase number of video resources
* commit '
25bee067b500484f8b0a1976da0ff672a7eb7e9e':
exynos_omx: Increase number of video resources
Dmitry Shmidt [Wed, 15 May 2013 19:42:08 +0000 (12:42 -0700)]
exynos_omx: Increase number of video resources
Bug:
8950258
Change-Id: I497fe3c199298dba3c0932cd640b0d3b98417ded
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Automerger [Mon, 13 May 2013 12:55:48 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Thu, 9 May 2013 21:19:51 +0000 (14:19 -0700)]
am
c7663a2e: am
6a3cbcaf: Merge "camera: Use cropRegion as 4 parts instead of 3 parts" into jb-mr2-dev
* commit '
c7663a2e6ff4a75548bb57a939a0ad78a3ff0030':
camera: Use cropRegion as 4 parts instead of 3 parts
Igor Murashkin [Thu, 9 May 2013 19:04:54 +0000 (12:04 -0700)]
am
6a3cbcaf: Merge "camera: Use cropRegion as 4 parts instead of 3 parts" into jb-mr2-dev
* commit '
6a3cbcafbfceabad2711388f1e417982deaf5fdf':
camera: Use cropRegion as 4 parts instead of 3 parts
Igor Murashkin [Thu, 9 May 2013 19:01:23 +0000 (19:01 +0000)]
Merge "camera: Use cropRegion as 4 parts instead of 3 parts" into jb-mr2-dev
Igor Murashkin [Tue, 7 May 2013 23:40:33 +0000 (16:40 -0700)]
camera: Use cropRegion as 4 parts instead of 3 parts
Bug:
8756080
Change-Id: Id3dff232091f73e4ed143d2f0010451c3709fbcb
The Android Automerger [Mon, 6 May 2013 12:55:39 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Thu, 2 May 2013 16:20:06 +0000 (09:20 -0700)]
am
e22e9935: am
7af11689: Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev
* commit '
e22e9935d1aff7224d1179385481a17886e41db2':
Camera2: Adjust sensor dimensions for correct FOV.
Eino-Ville Talvala [Thu, 2 May 2013 16:18:06 +0000 (09:18 -0700)]
am
7af11689: Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev
* commit '
7af1168953fa6aa5337de11fbf78d16fc6768834':
Camera2: Adjust sensor dimensions for correct FOV.
Eino-Ville Talvala [Thu, 2 May 2013 16:15:54 +0000 (16:15 +0000)]
Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev
projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / log