GitHub/LineageOS/android_hardware_samsung_slsi_exynos5.git
10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Mon, 11 Aug 2014 06:16:17 +0000 (06:16 +0000)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Sun, 10 Aug 2014 13:09:00 +0000 (06:09 -0700)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Sat, 9 Aug 2014 13:10:10 +0000 (06:10 -0700)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Thu, 7 Aug 2014 13:10:17 +0000 (06:10 -0700)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Wed, 6 Aug 2014 13:09:42 +0000 (06:09 -0700)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Tue, 5 Aug 2014 13:09:31 +0000 (06:09 -0700)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Mon, 4 Aug 2014 13:08:51 +0000 (06:08 -0700)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Sun, 3 Aug 2014 13:09:03 +0000 (06:09 -0700)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agomerge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381
The Android Automerger [Sat, 2 Aug 2014 13:10:10 +0000 (06:10 -0700)]
merge in lmp-release history after reset to 4ec0f6d29023b78e08ed6afb3a985c91495ae381

10 years agoexynos_omx: multi_thread: Limit the number of added minUndequeuedBufs.
SeungBeom Kim [Tue, 22 Jul 2014 02:29:07 +0000 (11:29 +0900)]
exynos_omx: multi_thread: Limit the number of added minUndequeuedBufs.

The case of DRM Play,
Root cause is try to allocate more memory than the memory size reserved.

Bug: 13655631

Change-Id: Ib3799026a6fce87ea22fb680e02cd20402a8ce59
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoMerge "exynos_omx: multi_thread: Fix the wrong type casting and data access." into...
Lajos Molnar [Thu, 31 Jul 2014 14:31:06 +0000 (14:31 +0000)]
Merge "exynos_omx: multi_thread: Fix the wrong type casting and data access." into lmp-dev

10 years agoexynos_omx: multi_thread: Fix the wrong type casting and data access.
SeungBeom Kim [Wed, 23 Jul 2014 06:04:13 +0000 (15:04 +0900)]
exynos_omx: multi_thread: Fix the wrong type casting and data access.

The case of using AndroidNativeBuffer,
Errors can happen in Exynos_OSAL_RefANB_Increase by wrong type casting and data access.
The cause, there was a omit to commit merge.
(currently don't need. =>  https://partner-android-review.googlesource.com/#/c/28006/2)

Bug: 10192533
Change-Id: Ie296d6a25da447c4d29b671dc722019cd57aa994
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoMerge "exynos_omx: multi_thread: Fix bug about EOS Flag multi return." into lmp-dev
Lajos Molnar [Thu, 31 Jul 2014 14:30:15 +0000 (14:30 +0000)]
Merge "exynos_omx: multi_thread: Fix bug about EOS Flag multi return." into lmp-dev

10 years agoexynos_omx: multi_thread: Limit the number of added minUndequeuedBufs.
SeungBeom Kim [Tue, 22 Jul 2014 02:29:07 +0000 (11:29 +0900)]
exynos_omx: multi_thread: Limit the number of added minUndequeuedBufs.

The case of DRM Play,
Root cause is try to allocate more memory than the memory size reserved.

Bug: 13655631

Change-Id: Ib3799026a6fce87ea22fb680e02cd20402a8ce59
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoexynos_omx: multi_thread: Fix bug about EOS Flag multi return.
SeungBeom Kim [Thu, 5 Jun 2014 06:34:27 +0000 (15:34 +0900)]
exynos_omx: multi_thread: Fix bug about EOS Flag multi return.

There is a bug that EOS Flag is returned many times in special cases.
Bug: 11998913

Change-Id: I98b334384faaeb3897d1b0ecfb695b9e254e13ac
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoMerge "HWComposer: Fix an fd leak on boot with HDMI"
Dan Stoza [Thu, 19 Jun 2014 17:29:24 +0000 (17:29 +0000)]
Merge "HWComposer: Fix an fd leak on boot with HDMI"

10 years agoam 382b877c: am d7bd3543: Merge "Switch from getdtablesize(3) to sysconf(3)."
Dan Albert [Tue, 17 Jun 2014 09:35:44 +0000 (09:35 +0000)]
am 382b877c: am d7bd3543: Merge "Switch from getdtablesize(3) to sysconf(3)."

* commit '382b877cf52e23faee17fdaa9404d5feebed2bb4':
  Switch from getdtablesize(3) to sysconf(3).

10 years agoam d7bd3543: Merge "Switch from getdtablesize(3) to sysconf(3)."
Dan Albert [Tue, 17 Jun 2014 08:52:32 +0000 (08:52 +0000)]
am d7bd3543: Merge "Switch from getdtablesize(3) to sysconf(3)."

* commit 'd7bd354358ecfb1e52afb3da4fc586c0822c696a':
  Switch from getdtablesize(3) to sysconf(3).

10 years agoMerge "Switch from getdtablesize(3) to sysconf(3)."
Dan Albert [Tue, 17 Jun 2014 05:07:34 +0000 (05:07 +0000)]
Merge "Switch from getdtablesize(3) to sysconf(3)."

10 years agoSwitch from getdtablesize(3) to sysconf(3).
Dan Albert [Mon, 16 Jun 2014 22:36:30 +0000 (15:36 -0700)]
Switch from getdtablesize(3) to sysconf(3).

Change-Id: I4741ea034fdadf1c6cd07c36aee3156f2415fae2

10 years agoSwitch from getdtablesize(3) to sysconf(3).
Dan Albert [Mon, 16 Jun 2014 22:36:30 +0000 (15:36 -0700)]
Switch from getdtablesize(3) to sysconf(3).

Change-Id: I4741ea034fdadf1c6cd07c36aee3156f2415fae2

10 years agoHWComposer: Fix an fd leak on boot with HDMI
Dan Stoza [Tue, 10 Jun 2014 17:19:10 +0000 (10:19 -0700)]
HWComposer: Fix an fd leak on boot with HDMI

When the device is booting with an attached external display, every
frame leaks a file descriptor until the display manager enables the
external display, resulting in hundreds of leaked descriptors. This
plugs the leak.

Change-Id: Ib7e2af3638dab28c2ed04c02ddf9c485edf2bb9d

10 years agoexynos_omx: multi_thread: Add Dynamic resolution change support code for Mpeg4 and...
SeungBeom Kim [Tue, 8 Apr 2014 00:54:55 +0000 (09:54 +0900)]
exynos_omx: multi_thread: Add Dynamic resolution change support code for Mpeg4 and Vp8.

Add Dynamic resolution change support code for Mpeg4 and Vp8.
Need revert commit 0904c3659d032f759aa2877873e1fb335166435a

Bug: 11972823
Change-Id: I0ca913baaa890b2d766ce257923617349797e9bf
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoexynos_omx: multi_thread: Modified the scheme of reference count inc/dec.
SeungBeom Kim [Fri, 13 Dec 2013 02:11:19 +0000 (11:11 +0900)]
exynos_omx: multi_thread: Modified the scheme of reference count inc/dec.

<Old>
    - Call the hw_get_module for reference count processing when receives a buffer of each.
    - Call the hw_get_module every frame, an increase in power consumption.
<New>
    - Call the hw_get_module once on init time.
    - It is a small amount, but the reduction of power consumption.

Change-Id: I8489144ef57a46637c32c869c23032d353830c70
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoexynos_omx: multi_thread: Change scheme of codec buffer alloc in video encode.
SeungBeom Kim [Fri, 8 Nov 2013 03:33:36 +0000 (12:33 +0900)]
exynos_omx: multi_thread: Change scheme of codec buffer alloc in video encode.

The case of input port copy mode in video encode, Need codec buffer.
This patch supports dynamic calculation of the buffer size of the codec.

Bug: 10838086
Change-Id: I7b7ad97a57455a861ad8e93964891565d95a3899
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoexynos_omx: multi_thread: Fix scheme of output metadata buffer in Decode component.
SeungBeom Kim [Tue, 29 Oct 2013 23:40:23 +0000 (08:40 +0900)]
exynos_omx: multi_thread: Fix scheme of output metadata buffer in Decode component.

ION-FD reference count increase works incorrect. if using output metadata buffer in Decode component.

Bug: 10916591
Change-Id: I34241372c089339290bb43a65832a4eebd6ca86c
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoexynos_omx: multi_thread: Add compensate the defect of dynamic resolution change.
SeungBeom Kim [Wed, 23 Oct 2013 04:59:49 +0000 (13:59 +0900)]
exynos_omx: multi_thread: Add compensate the defect of dynamic resolution change.

If seek position immediately after Dynamic resolution change, error occurs.
Also, the case of if send port_disable command immediately after flush, error occurs.

Bug: 11006942
Change-Id: I9db181542b84778df5609c1f4ce9bec297fe7dd1
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoexynos_omx: multi_thread: Add buffer index reset scheme.
SeungBeom Kim [Wed, 23 Oct 2013 04:54:39 +0000 (13:54 +0900)]
exynos_omx: multi_thread: Add buffer index reset scheme.

Add buffer index reset scheme when the Dynamic Resolution Change with dynamic DPB Change working.

Bug: 10916591
Change-Id: I897c81beb2d0c8a83399e0d1e1d5c4658d9bb00c
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
10 years agoRevert "Don't advertise metadata mode for VP8 decoder."
Lajos Molnar [Fri, 16 May 2014 23:26:51 +0000 (16:26 -0700)]
Revert "Don't advertise metadata mode for VP8 decoder."

This reverts commit 0904c3659d032f759aa2877873e1fb335166435a.

Bug: 11972823
Change-Id: I6bf6fe90a0ae269ad4725d972f68587c0bad248c

10 years agomantaray: drop FACE autofocus in Camera HAL for continuous video
Mark Salyzyn [Fri, 23 May 2014 16:25:49 +0000 (09:25 -0700)]
mantaray: drop FACE autofocus in Camera HAL for continuous video

BUG: 14818996
Change-Id: Ifc031c3bb69693642094776e6c48828ef5f877eb

10 years agoam 5b485127: am 49520247: am 0904c365: Don\'t advertise metadata mode for VP8 decoder.
Lajos Molnar [Wed, 30 Apr 2014 12:50:19 +0000 (12:50 +0000)]
am 5b485127: am 49520247: am 0904c365: Don\'t advertise metadata mode for VP8 decoder.

* commit '5b485127089c591c2744076ac73c10e2fca3da81':

10 years agoam f9860bce: am 565c46f8: am 5b1fd182: Merge "Remove #include <asm/page.h>."
Elliott Hughes [Wed, 30 Apr 2014 12:50:19 +0000 (12:50 +0000)]
am f9860bce: am 565c46f8: am 5b1fd182: Merge "Remove #include <asm/page.h>."

* commit 'f9860bce64d998ee696d6bc546b1fb2cdc4186f3':

10 years agoam 49520247: am 0904c365: Don\'t advertise metadata mode for VP8 decoder.
Lajos Molnar [Wed, 30 Apr 2014 00:59:01 +0000 (00:59 +0000)]
am 49520247: am 0904c365: Don\'t advertise metadata mode for VP8 decoder.

* commit '49520247dc58b67ab4bdbb19be37556d3c494305':

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 agogralloc: refcount private_module_t
Greg Hackmann [Wed, 2 Apr 2014 18:52:10 +0000 (11:52 -0700)]
gralloc: refcount private_module_t

gralloc_open() can be called multiple times in the same process, which
led to the existing ion fd leaking on each open; the surviving fd also
leaked on close.  Refcount the private_module_t to prevent this.

Bug: 13633155
Change-Id: I09ac8096fe0101b91b23e7c8d2ee9e11efe29b03
Signed-off-by: Greg Hackmann <ghackmann@google.com>
10 years agoam 5d58cc59: (-s ours) am bb2255ab: am 0904c365: Don\'t advertise metadata mode for...
Lajos Molnar [Mon, 24 Mar 2014 18:43:48 +0000 (18:43 +0000)]
am 5d58cc59: (-s ours) am bb2255ab: am 0904c365: Don\'t advertise metadata mode for VP8 decoder.

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

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 agoam 0904c365: Don\'t advertise metadata mode for VP8 decoder.
Lajos Molnar [Fri, 21 Mar 2014 19:31:53 +0000 (19:31 +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 7da161f6: am 5b1fd182: Merge "Remove #include <asm/page.h>."
Elliott Hughes [Tue, 25 Feb 2014 00:40:51 +0000 (00:40 +0000)]
am 7da161f6: am 5b1fd182: Merge "Remove #include <asm/page.h>."

* commit '7da161f6dbd796876b561d094cc0334a9d901368':
  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 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: 13012352
Change-Id: I759fb94c91c9f9e8108ed30fa2a2861ffc25096a

10 years agocamera3: Remove geometric correction tags.
Ruben Brunk [Mon, 10 Feb 2014 18:56:54 +0000 (10:56 -0800)]
camera3: Remove geometric correction tags.

Change-Id: I01d70e06540862f7f30df570cb447c4411d9e4d4

10 years agocamera3: Update maxRegions tag.
Ruben Brunk [Fri, 24 Jan 2014 02:21:46 +0000 (18:21 -0800)]
camera3: Update maxRegions tag.

Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01

10 years agocamera3: Update sceneMode tag spec.
Ruben Brunk [Sat, 18 Jan 2014 01:17:01 +0000 (17:17 -0800)]
camera3: Update sceneMode tag spec.

Change-Id: I495435397086a295280c556d94fe8efd442a12c3

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

* commit '8256754b2e0763cb4e900e3ebb9c64e0ee0f62c5':
  exynos: gralloc: replace struct ion_handle with ion_user_handle_t

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 174345d6: am b39943bf: am a61de09c: Merge "Move videodev2.h to include/linux."
Christopher Ferris [Mon, 16 Dec 2013 08:05:59 +0000 (08:05 +0000)]
am 174345d6: am b39943bf: am a61de09c: Merge "Move videodev2.h to include/linux."

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

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 agoam 79e6e466: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
Qiwen Zhao [Tue, 10 Dec 2013 18:47:17 +0000 (18:47 +0000)]
am 79e6e466: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

* commit '79e6e4661c327607f81908906509bfb8b948398f':

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

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 ba6a5751: am e5a9bc4a: am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c54...
The Android Open Source Project [Fri, 6 Dec 2013 22:19:19 +0000 (22:19 +0000)]
am ba6a5751: am e5a9bc4a: am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b\' into HEAD

* commit 'ba6a575167f1fe54a8c8d1418495b2e183f6e3db':

10 years agoam 3881c3ae: am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05...
The Android Open Source Project [Fri, 6 Dec 2013 22:19:18 +0000 (22:19 +0000)]
am 3881c3ae: am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD

* commit '3881c3ae357b3befec9226bcbf72f5a916457f97':

10 years agoam 03d1873b: am de9b6a49: am 070e4486: Merge "mobicore: do not use GNU old-style...
Nick Kralevich [Fri, 6 Dec 2013 22:19:18 +0000 (22:19 +0000)]
am 03d1873b: am de9b6a49: am 070e4486: Merge "mobicore: do not use GNU old-style field designators"

* commit '03d1873bd2c0fe904a81b0ec213bb37917d9516a':

10 years agoam 651db9b8: am 504c5d9c: am a883fe8d: merge in klp-release (no-op)
Ed Heyl [Fri, 6 Dec 2013 22:19:17 +0000 (22:19 +0000)]
am 651db9b8: am 504c5d9c: am a883fe8d: merge in klp-release (no-op)

* commit '651db9b8cc7d71e0c150e103cc97db900e226808':

10 years agoam 61a44ef2: am ad73045f: am a3bcc37b: libcamera2: Video Stabilization Killswitch
Alex Ray [Fri, 6 Dec 2013 22:19:17 +0000 (22:19 +0000)]
am 61a44ef2: am ad73045f: am a3bcc37b: libcamera2: Video Stabilization Killswitch

* commit '61a44ef24f5f0a1b102a613931d10125f04eeb91':

10 years agoam 7d5f1d21: am 049dc0cc: am 4ed83a2b: merge in KQS81M
Ed Heyl [Fri, 6 Dec 2013 22:19:16 +0000 (22:19 +0000)]
am 7d5f1d21: am 049dc0cc: am 4ed83a2b: merge in KQS81M

* commit '7d5f1d21937f73102e47ea094112f913b0a62923':

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

* commit 'ba949fe2d7f7a216c7992be462136ba9f0da145e':

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

* commit 'f3dcf4a26a8f4d95377015db72aea2ea98edb5b9':

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

* commit 'acb664cbec254b0e205bcb6dd9abc4842f76d765':

10 years agoam b531855a: am a9911a58: am c0b4a4f1: hwc: do not allow gsc downscaling by exactly...
Greg Hackmann [Fri, 6 Dec 2013 22:19:14 +0000 (22:19 +0000)]
am b531855a: am a9911a58: am c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale

* commit 'b531855a2966a5d7f0d23ca1259d1c1328ee3a44':

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

* commit 'd0cb3ab7560a3871fb132ba359dcb4613a9c2455':

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

* commit 'ac21dce2b0be89048630dac6289aca64e8b63f9e':

10 years agoam aaf4fcb0: am db543703: am a4863a2a: libcamera2: hardwareSupportedLevel should...
Zhijun He [Fri, 6 Dec 2013 22:19:13 +0000 (22:19 +0000)]
am aaf4fcb0: am db543703: am a4863a2a: libcamera2: hardwareSupportedLevel should be limited

* commit 'aaf4fcb087a8a6e065e9f7970e01c429053dec3a':

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

* commit 'c6f943f8c58300ff04ffbebc72031fa10ed51422':

10 years agoam 5f6cd76f: am abe4b6d8: am bd09b814: exynos_omx: multi_thread: Fix for dynamic...
SeungBeom Kim [Fri, 6 Dec 2013 22:19:11 +0000 (22:19 +0000)]
am 5f6cd76f: am abe4b6d8: am bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.

* commit '5f6cd76fab310d65ae1ff1b58f991d154c90081e':

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

* commit '82fcc96245cf003429377508a46734c416ab8619':

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 e5a9bc4a: am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b...
The Android Open Source Project [Fri, 6 Dec 2013 01:38:45 +0000 (01:38 +0000)]
am e5a9bc4a: am 2dc79df2: Merge commit \'de9b6a49620d14c09bc95a1b80e9c5496cf4029b\' into HEAD

* commit 'e5a9bc4aa309d0989b2663a8f49d0b2661bcf81f':

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

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.

Change-Id: Ia9aeaf88b477b252e5bbb8fb9655a68b6042e183

11 years agoam 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858...
The Android Open Source Project [Sat, 23 Nov 2013 03:31:24 +0000 (19:31 -0800)]
am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD

* commit '84a0fc9c00d5fa6facbd26eac7da00c58cea87a9':

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':