Jussi Saavalainen [Wed, 17 Oct 2012 09:40:41 +0000 (12:40 +0300)]
Merge branch '2.0_beta'
Fix conflicts caused by gbs changelog
Conflicts:
packaging/mfldv4l2camsrc.changes
Change-Id: I1327eb986e35ef3bb1a3e06e6a1c5fb4d21db3a4
Marko Ollonen [Fri, 5 Oct 2012 07:17:08 +0000 (10:17 +0300)]
tap to focus configuration support
Change-Id: I63f08a5a6fd6e13b16fffd4da9bb82e12463056f
Marko Ollonen [Wed, 3 Oct 2012 09:35:14 +0000 (12:35 +0300)]
update version number and changelog
Marko Ollonen [Wed, 3 Oct 2012 06:54:27 +0000 (09:54 +0300)]
REMOVE ME: temporary solution to get still image resolutions to work.
Currently used interface does not have any indication
for still image capture from multimedia framework.
Change-Id: I44af17f1d1db786670578159020afa1327e0c738
Marko Ollonen [Tue, 2 Oct 2012 08:09:12 +0000 (11:09 +0300)]
Add support for request negotiation.
Change-Id: I255f4176a69375670f8d322cb9fb76a658a2b87c
Marko Ollonen [Mon, 1 Oct 2012 12:34:51 +0000 (15:34 +0300)]
Add support for configuring capture format configuration.
User can use this property to prepare source to take image
Change-Id: I1798ee45aeec3ce7ec53f90bd19dc8b96a4f9d96
Marko Ollonen [Thu, 20 Sep 2012 12:25:44 +0000 (15:25 +0300)]
Add support fot configuring capture-width and capture-height
User can use these properties to prepare source to take image.
Change-Id: Id1f54d1f0d4664159a6ab4e52f50c46113f3b2b9
Jussi Saavalainen [Thu, 13 Sep 2012 12:51:41 +0000 (15:51 +0300)]
Check resolution against bad scaling on mode switch
The scaler on the HW will silently corrupt images on some resolutions.
Refuse to use these.
Change-Id: I0b719728a53f963ab963f6efab80f46936393474
Jussi Saavalainen [Wed, 12 Sep 2012 07:54:11 +0000 (10:54 +0300)]
Report support for all resolutions in caps
Since our scaling steps are quite small, reporting them in caps would
have plugin init and negotiation take minutes. Report the whole range
in caps, with no fixed FPS. This also means we'll end up failing in
mode setup if given bad caps.
Change-Id: I96ec7d8cdf91e17f05718cc4f17cb086e806efa6
Jussi Saavalainen [Thu, 13 Sep 2012 13:09:03 +0000 (16:09 +0300)]
Don't modify probed cap frame size
Remove restriction to 16*16 scale steps from upstream code.
Change-Id: Ib5aaa7449e3e4e0cd46747b19ef856e0ca5136ee
Jussi Saavalainen [Mon, 10 Sep 2012 12:34:51 +0000 (15:34 +0300)]
Give real instead of page-aligned buffer size to Gstreamer
We handle all our buffers as page-aligned mmap'ed chunks, and so
their size is often larger than their contents. This breaks plugins
that insist on computing the buffer size from the caps we report.
Fix this by explicitly setting GST_BUFFER_SIZE for the final buffer
as the content size. This will break if we ever want to use this
camera source with devices that can do encoding on the v4l layer
or below.
Change-Id: I1b6d848162bfa9e06e729ebb7b6d986ba5a056ce
Marko Ollonen [Thu, 6 Sep 2012 08:17:29 +0000 (11:17 +0300)]
return value in camera_control_set_strobe changed
Change-Id: I4ba0411cc03bbf13d875f726903b6bb8a2937a75
Marko Ollonen [Thu, 6 Sep 2012 08:17:29 +0000 (11:17 +0300)]
return value in camera_control_set_strobe changed
Change-Id: I4ba0411cc03bbf13d875f726903b6bb8a2937a75
Marko Ollonen [Wed, 5 Sep 2012 11:26:30 +0000 (14:26 +0300)]
update changelog
Change-Id: I6964a7002100369fdbbb606687549621668a0807
Marko Ollonen [Wed, 5 Sep 2012 11:26:30 +0000 (14:26 +0300)]
update changelog
Change-Id: I6964a7002100369fdbbb606687549621668a0807
Marko Ollonen [Tue, 4 Sep 2012 12:50:34 +0000 (15:50 +0300)]
Flash mode setting support down to atom isp
Change-Id: Ied618eb69c88c649fa33c6e1b6687eda7c4bb116
Marko Ollonen [Tue, 4 Sep 2012 12:50:34 +0000 (15:50 +0300)]
Flash mode setting support down to atom isp
Change-Id: Ied618eb69c88c649fa33c6e1b6687eda7c4bb116
Marko Ollonen [Tue, 4 Sep 2012 08:52:21 +0000 (11:52 +0300)]
atom isp header update
Change-Id: I203fdd8a10669b8231a3a297c778928f06b0c291
Marko Ollonen [Thu, 30 Aug 2012 12:39:48 +0000 (15:39 +0300)]
atomisphal update
Change-Id: I17e513ff347a7729543fb1eb4db4a207c3355850
Marko Ollonen [Thu, 30 Aug 2012 11:33:53 +0000 (14:33 +0300)]
still capture support added to camera control interface
Change-Id: I416e1a7791b41a3d59a7d08a20b31ecb680bee56
Marko Ollonen [Wed, 29 Aug 2012 10:14:41 +0000 (13:14 +0300)]
cleanup exif info
Change-Id: I84970bb609dfea47efc21f73dfbdadd4d7fab374
Jussi Saavalainen [Tue, 28 Aug 2012 13:05:21 +0000 (16:05 +0300)]
Remove min/max frame size discovery from hot path
When enumeration fails, we use probed min/max frame size, done by setting
the format directly. Move this to happen at the error case only since it
gets quite slow when there's lots of formats to support.
Change-Id: I8ebcdf03aaa6088488319c5cfaa316e43b4b5777
Jussi Saavalainen [Mon, 27 Aug 2012 11:34:21 +0000 (14:34 +0300)]
REMOVE ME: Pretend to support 30 FPS regardless of what driver thinks
The driver seems a bit quirky as far as frame intervals go, so ignore
part of the results for now. Fix this when the driver enumeration
starts making sense.
Change-Id: Ie3149003a7b30cf0b43163667fcbd4f607a723ee
Jussi Saavalainen [Thu, 23 Aug 2012 12:12:28 +0000 (15:12 +0300)]
Report only discrete resolutions in caps, avoid duplicates
We just filtered the caps, so don't attempt to expand them again.
Change-Id: I5c94dc4f37056647effedec0c8e605f5e22ed950
Jussi Saavalainen [Tue, 21 Aug 2012 09:53:58 +0000 (12:53 +0300)]
Support ranges for discovered resolutions, with filtering to caps
Some drivers (including ours) return the supported resolutions as
(stepwise-)continuous ranges, which cause trouble with pipelines
unless there's careful caps filtering in place. Add support to
this kind of driver, and pre-filter the list in caps so there's
less combinations to go through in negotiation.
Change-Id: If7b8b166b25ea9f7efa4d8b1867781e85183851f
Jussi Saavalainen [Mon, 27 Aug 2012 11:23:02 +0000 (14:23 +0300)]
Disable calls to broken VIDIOC_TRY_FMT
Our driver doesn't properly handle the TRY_FMT calls, so relying on their
results will only get us in trouble.
Change-Id: I7f83564127224e31a8e3270f07e1a2ffc1836e24
Jussi Saavalainen [Mon, 27 Aug 2012 11:18:13 +0000 (14:18 +0300)]
Clean up most trivial warnings
Do some housekeeping to better catch actual problems.
Change-Id: I1824e0b91c55450006fda1279012117bc9495164
Marko Ollonen [Fri, 17 Aug 2012 09:47:41 +0000 (12:47 +0300)]
fix zoom step 1
Change-Id: I29a8ed0b0c3c3aab6afbc6b8e46dc49ce28e87b1
Marko Ollonen [Thu, 16 Aug 2012 13:24:11 +0000 (16:24 +0300)]
zoom support added to camera control interface
Change-Id: I1344f343fc320f592681be608ebe1437cff5d0e8
Marko Ollonen [Thu, 16 Aug 2012 11:01:32 +0000 (14:01 +0300)]
rank YUV and RGB formats
Change-Id: I21ea673b975b453e2350bc78f8095af86ca1a718
Marko Ollonen [Thu, 16 Aug 2012 08:07:50 +0000 (11:07 +0300)]
exif info read support for camera control interface
Change-Id: Ic703594efbcdb92966f0c5a2e3a362a3d899f6e2
Marko Ollonen [Tue, 14 Aug 2012 15:02:45 +0000 (18:02 +0300)]
Revert "Manually merge upstream non-discrete framesize enumeration"
This reverts commit
1ac30c6cbf6eb921643add872295c04cb4bb7b7e.
Change-Id: I088b40e1a181da108fb6e11e52addb4bc408b3ef
Jussi Saavalainen [Tue, 14 Aug 2012 13:18:26 +0000 (16:18 +0300)]
Move log spam from caps enum due to frame sizes into higher level
When the stepwise framesize has a low step value, we'll get quite
a bit of logs. Make some effort to limit them.
Update changelog for branch contents.
Change-Id: If6441307baf24927e0e4fb76c26a4a02d2bb50dc
Jussi Saavalainen [Tue, 14 Aug 2012 12:05:23 +0000 (15:05 +0300)]
Manually merge upstream non-discrete framesize enumeration
Upstream v4l2src has some support for handling the stepwise frame
size enumeration result on our current driver. Include that here,
with the caveat that this will extend the caps list quite a bit.
We could just use ranges, except that each frame size may have
a different supported framerate range.
Change-Id: Idfea4cb6eaa72c7e6998a2d03c49d56c43008771
Jussi Saavalainen [Tue, 14 Aug 2012 09:43:40 +0000 (12:43 +0300)]
Log unknowns when ranking pixel formats
The driver may give us pixel formats we don't know about. Log those
in case we want them at higher ranks.
Change-Id: Ifcc8c6732361712d51cc4dce2998e966ff3059e4
Marko Ollonen [Tue, 14 Aug 2012 09:37:19 +0000 (12:37 +0300)]
basic AF support to camera control interface
Change-Id: I01a2e48a3eb0e3bfd26f5846ac35269a2c57a48f
Marko Ollonen [Fri, 10 Aug 2012 11:25:19 +0000 (14:25 +0300)]
update changelog
Marko Ollonen [Thu, 9 Aug 2012 14:07:42 +0000 (17:07 +0300)]
photo effect support added.
Change-Id: I5cecf61bdfeabd8a446d960f5a64c972760fadf8
Marko Ollonen [Thu, 9 Aug 2012 11:23:53 +0000 (14:23 +0300)]
strobe mode setting via camera control interface added.
Change-Id: I7a6813217924b15fec11448c4e99a5d843afc615
Saavalainen, Jussi [Tue, 7 Aug 2012 12:55:46 +0000 (05:55 -0700)]
Merge "atomisp interface update"
Marko Ollonen [Tue, 7 Aug 2012 10:55:55 +0000 (13:55 +0300)]
atomisp interface update
Change-Id: I8a8b67910c8f2f4a0d731f7662706cd16c6535b5
Marko Ollonen [Tue, 7 Aug 2012 10:30:17 +0000 (13:30 +0300)]
Camera control interface skeleton.
Change-Id: Ic3e7f88b201636c88d9bf9f57c01d08a8227e04f
Marko Ollonen [Fri, 3 Aug 2012 07:00:25 +0000 (10:00 +0300)]
vflip and hflip properties added.
Change-Id: I6f495f967f25a08168c7e759538d4f4c50ac42f5
Marko Ollonen [Thu, 19 Jul 2012 07:57:34 +0000 (10:57 +0300)]
update changelog
Marko Ollonen [Thu, 19 Jul 2012 05:53:23 +0000 (08:53 +0300)]
Change primary and secondary camera index to v4l2 interface.
Change-Id: I87988e1ec3084585e07399bd722bb52965404781
Marko Ollonen [Wed, 18 Jul 2012 08:48:25 +0000 (11:48 +0300)]
update changelog
Marko Ollonen [Wed, 18 Jul 2012 07:01:06 +0000 (10:01 +0300)]
Camera selection interface change input-sensor to camera-id.
Change-Id: I5be6821d7d7af23b832b25b3154fa28edfef2371
Telle-Tiia Pitkänen [Tue, 10 Jul 2012 07:36:05 +0000 (10:36 +0300)]
Version 0.43, release to OBS, second try
Change-Id: I58d132ae7799241538082e5492a163653974fdde
Telle-Tiia Pitkänen [Tue, 10 Jul 2012 04:58:02 +0000 (07:58 +0300)]
Version 0.43, release to OBS
Change-Id: I6969893def7f9951296bb25fabdc8578849422b4
Jussi Saavalainen [Thu, 28 Jun 2012 12:37:09 +0000 (15:37 +0300)]
Merge branch 'initial' into init-2
Saavalainen, Jussi [Thu, 28 Jun 2012 12:30:44 +0000 (05:30 -0700)]
Merge "Release for 0.41. Signed-off-by: Hu Gang <gang.a.hu@intel.com>"
Jussi Saavalainen [Thu, 28 Jun 2012 07:15:55 +0000 (10:15 +0300)]
Add packaging
Jussi Saavalainen [Thu, 28 Jun 2012 06:40:52 +0000 (09:40 +0300)]
Disable gtkdoc build
Jussi Saavalainen [Thu, 28 Jun 2012 06:28:45 +0000 (09:28 +0300)]
Add needed videodev.h include
The ancient V4L1 interface is removed from Linux since 2.6.38. Add the
include in-tree for now.
Jussi Saavalainen [Thu, 28 Jun 2012 06:26:39 +0000 (09:26 +0300)]
Use proper build flags for atomisphal
We already pick the right Gst flags when configuring, so use those instead
of hardcoding paths. Fixes build in various multiarch situations.
Hu Gang [Mon, 28 Mar 2011 03:38:55 +0000 (11:38 +0800)]
Release for 0.42.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Yu Xia [Wed, 9 Mar 2011 06:25:03 +0000 (14:25 +0800)]
fix issue that AF is not stopped when AF process is timeout
Signed-off-by: Xiaolin Zhang <xiaolin.zhang@intel.com>
lyang56 [Tue, 8 Mar 2011 03:05:26 +0000 (11:05 +0800)]
fix some warning for makernote
Signed-off-by: Xiaolin Zhang <xiaolin.zhang@intel.com>
Hu Gang [Wed, 16 Mar 2011 15:44:49 +0000 (23:44 +0800)]
Add the kernel hearder file atomisp_v4l2.h for release.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Mon, 7 Mar 2011 17:27:46 +0000 (01:27 +0800)]
Code cleanup in camera source.
Remove the mfld_v4l2.h. Include the atomisp_v4l2.h from driver.
Update some data structure name according to driver update.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Signed-off-by: Xiaolin Zhang <xiaolin.zhang@intel.com>
Hu Gang [Fri, 4 Mar 2011 17:11:27 +0000 (01:11 +0800)]
Fix XNR and GDC.
Wait more time before timeout as GDC is quite slow.
Fix XNR enum error.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Signed-off-by: Xiaolin Zhang <xiaolin.zhang@intel.com>
Hu Gang [Tue, 1 Mar 2011 08:20:42 +0000 (16:20 +0800)]
Reenable capture mode settings. Remove the error reutrn from request 0 buffer. Request 0 buffers is not supported by USB camera. If return error from request 0 buffer, will cause the image capture failed in camerabin. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Sat, 19 Feb 2011 09:20:58 +0000 (17:20 +0800)]
Init the sem_3a Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Thu, 17 Feb 2011 08:49:22 +0000 (16:49 +0800)]
Fix for the image capture with camerabin. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Thu, 17 Feb 2011 02:37:13 +0000 (10:37 +0800)]
Disable binary switch in ISP. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Thu, 17 Feb 2011 02:33:43 +0000 (10:33 +0800)]
Merge the patch to add the sem_wait in 3A loop. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Tue, 15 Feb 2011 09:32:39 +0000 (17:32 +0800)]
Code clean up fo the cam_capture_frame. Create a small function. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Yu Xia [Tue, 15 Feb 2011 03:38:20 +0000 (11:38 +0800)]
add pre-flash support in camsrc
Hu Gang [Tue, 15 Feb 2011 06:12:58 +0000 (14:12 +0800)]
Code cleanup for the photography interface. Fix the fps_n/fps_d is NULL which cause gst_v4l2camsrc_set_capture fault. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Wed, 16 Feb 2011 05:49:35 +0000 (13:49 +0800)]
Add the get scene mode.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Fri, 11 Feb 2011 16:03:22 +0000 (00:03 +0800)]
Merge branch 'master' of git@gitorious.org:maemo-multimedia/mfldv4l2camsrc
Hu Gang [Fri, 11 Feb 2011 15:26:46 +0000 (23:26 +0800)]
Release for 0.41.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Fri, 11 Feb 2011 15:26:46 +0000 (23:26 +0800)]
Release for 0.5.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Fri, 11 Feb 2011 15:15:32 +0000 (23:15 +0800)]
Bug fix for the AF done message send.
As the AF status always return 0 from the 3A library.
Currently send the AF status to application alwasy if user open the AF
debug flag for the camera source property.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Fri, 11 Feb 2011 14:52:16 +0000 (22:52 +0800)]
Bug fix for AF windows.
Don't set the AF metering mode to SPOT when set the AF windows.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Fri, 11 Feb 2011 08:57:51 +0000 (16:57 +0800)]
Update the focus position range Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Thu, 10 Feb 2011 06:18:36 +0000 (14:18 +0800)]
Print the camera source interface version number Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Thu, 10 Feb 2011 06:02:42 +0000 (14:02 +0800)]
Bug fix for DVS. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
lyang56 [Mon, 31 Jan 2011 11:21:49 +0000 (19:21 +0800)]
enable only capture, modify makenote get from drivers
Hu Gang [Tue, 1 Feb 2011 06:55:03 +0000 (14:55 +0800)]
Add focus status check for each frame. Send the focus success message to application. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Mon, 31 Jan 2011 07:47:15 +0000 (15:47 +0800)]
Add debug messages to the cam_feature_set. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Mon, 31 Jan 2011 03:35:55 +0000 (11:35 +0800)]
Add the debug-flags property for performance tuning and maker note Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Sat, 29 Jan 2011 03:22:42 +0000 (11:22 +0800)]
Update interface with 3A to
20110128 Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Thu, 27 Jan 2011 09:48:18 +0000 (17:48 +0800)]
code cleanup for new SH release. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Thu, 27 Jan 2011 08:28:21 +0000 (16:28 +0800)]
Update the interface between libmfldadvci and camera source. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
lyang56 [Thu, 27 Jan 2011 02:57:37 +0000 (10:57 +0800)]
modify the call dirver's method
Hu Gang [Wed, 26 Jan 2011 13:03:04 +0000 (21:03 +0800)]
Add version number control between camera source and libmfldadvci. Currently, the version is
20110126 Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Thu, 27 Jan 2011 06:01:32 +0000 (14:01 +0800)]
Disable maker note by default.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Hu Gang [Tue, 25 Jan 2011 11:03:29 +0000 (19:03 +0800)]
Release for 0.4
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Jianxu zheng [Mon, 24 Jan 2011 12:15:44 +0000 (20:15 +0800)]
adding af windows property
Signed-off-by: Jianxu zheng <jian.xu.zheng@intel.com>
Jianxu zheng [Mon, 24 Jan 2011 11:28:13 +0000 (19:28 +0800)]
adding ae window property
Signed-off-by: Jianxu zheng <jian.xu.zheng@intel.com>
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
Jianxu zheng [Mon, 24 Jan 2011 09:04:52 +0000 (17:04 +0800)]
adding af metering mode property
Signed-off-by: Jianxu zheng <jian.xu.zheng@intel.com>
Jianxu zheng [Mon, 24 Jan 2011 08:44:03 +0000 (16:44 +0800)]
adding ae metering mode property
Signed-off-by: Jianxu zheng <jian.xu.zheng@intel.com>
Hu Gang [Mon, 24 Jan 2011 11:48:42 +0000 (19:48 +0800)]
Update zoom to make it have effect in all modes.
Signed-off-by: Hu Gang <gang.a.hu@intel.com>
peng liu [Wed, 19 Jan 2011 07:33:33 +0000 (15:33 +0800)]
update capture_stop func, request 0 buffers to release buffer manually
Hu Gang [Sun, 23 Jan 2011 12:34:49 +0000 (20:34 +0800)]
Fix some compile warning. Fix the brightness settings. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
lyang56 [Sun, 23 Jan 2011 11:10:52 +0000 (19:10 +0800)]
the 2rd exif makernote gst-libs
Hu Gang [Sun, 23 Jan 2011 11:56:40 +0000 (19:56 +0800)]
Move GDC to other position. Signed-off-by: Hu Gang <gang.a.hu@intel.com>
lyang56 [Sun, 23 Jan 2011 11:18:34 +0000 (19:18 +0800)]
the 2rd exif makernote gst
lyang56 [Sun, 23 Jan 2011 10:50:23 +0000 (18:50 +0800)]
the 2rd exif makernote extension libmfldadvci