Bug 45: Added lazyleoppard deinterlacing patch.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1459 e3e1d417-86f3-4887-817a-d78f3d33393f

src/zm_local_camera.cpp

@@ -29,6 +29,7 @@
 
 int LocalCamera::camera_count = 0;
 int LocalCamera::m_cap_frame = 0;
+int LocalCamera::m_cap_frame_active = 0;
 int LocalCamera::m_sync_frame = 0;
 video_mbuf LocalCamera::m_vmb;
 video_mmap *LocalCamera::m_vmm;
@@ -546,6 +547,13 @@ int LocalCamera::PreCapture()
 	{
 		//Info(( "Switching" ));
 		struct video_channel vid_src;
+		memset( &vid_src, 0, sizeof(vid_src) );
+		vid_src.channel = channel;
+		if ( ioctl( m_videohandle, VIDIOCGCHAN, &vid_src) < 0 )
+		{
+			Error(( "Failed to get camera source %d: %s", channel, strerror(errno) ));
+			return(-1);
+		}
 
 		vid_src.channel = channel;
 		vid_src.norm = format;
@@ -557,9 +565,10 @@ int LocalCamera::PreCapture()
 			return( -1 );
 		}
 	}
-	if ( ioctl( m_videohandle, VIDIOCMCAPTURE, &m_vmm[m_cap_frame] ) < 0 )
+	m_cap_frame_active = m_cap_frame;
+	if ( ioctl( m_videohandle, VIDIOCMCAPTURE, &m_vmm[m_cap_frame_active] ) < 0 )
 	{
-		Error(( "Capture failure for frame %d: %s", m_cap_frame, strerror(errno)));
+		Error(( "Capture failure for frame %d: %s", m_cap_frame_active, strerror(errno) ));
 		return( -1 );
 	}
 	m_cap_frame = (m_cap_frame+1)%m_vmb.frames;
@@ -569,12 +578,27 @@ int LocalCamera::PreCapture()
 int LocalCamera::PostCapture( Image &image )
 {
 	//Info(( "%s: Capturing image", id ));
-
+	int captures_per_frame = 1;
-	if ( ioctl( m_videohandle, VIDIOCSYNC, &m_sync_frame ) )
+	if ( camera_count > 1 )
+		captures_per_frame = config.captures_per_frame;
+	while ( captures_per_frame )
 	{
-		Error(( "Sync failure for frame %d: %s", m_sync_frame, strerror(errno)));
+		if ( ioctl( m_videohandle, VIDIOCSYNC, &m_sync_frame ) < 0 )
+		{
+			Error(( "Sync failure for frame %d buffer %d(%d): %s", m_sync_frame, m_cap_frame_active, captures_per_frame, strerror(errno) ));
 			return( -1 );
 		}
+		captures_per_frame--;
+		if ( captures_per_frame )
+		{
+			if ( ioctl( m_videohandle, VIDIOCMCAPTURE, &m_vmm[m_cap_frame_active] ) < 0 )
+			{
+				Error(( "Capture failure for buffer %d(%d): %s", m_cap_frame_active, captures_per_frame, strerror(errno) ));
+				return( -1 );
+			}
+		}
+	}
+	//Info(( "Captured %d for %d into %d", m_sync_frame, channel, m_cap_frame_active));
 
 	unsigned char *buffer = m_buffer+(m_sync_frame*m_vmb.size/m_vmb.frames);
 	m_sync_frame = (m_sync_frame+1)%m_vmb.frames;

src/zm_local_camera.h

@@ -39,6 +39,7 @@ protected:
 
 protected:
 	static int m_cap_frame;
+       static int m_cap_frame_active;
 	static int m_sync_frame;
 	static video_mbuf m_vmb;
 	static video_mmap *m_vmm;

zmconfig.pl.in

@@ -655,6 +655,14 @@ my @options =
 		type => $types{boolean},
 		category => 'config',
 	},
+	{
+		name => "ZM_CAPTURES_PER_FRAME",
+		default => "1",
+		description => "How many images are captured per returned frame, for shared local cameras",
+		help => "If you are using cameras attached to a video capture card which forces multiple inputs to share one capture chip, it can sometimes produce images with interlaced frames reversed resulting in poor image quality and a distinctive comb edge appearance. Increasing this setting allows you to force additional image captures before one is selected as the captured frame. This allows the capture hardware to 'settle down' and produce better quality images at the price of lesser capture rates. This option has no effect on (a) network cameras, or (b) where multiple inputs do not share a capture chip",
+		type => $types{integer},
+		category => 'config',
+	},
 	{
 		name => "ZM_SHM_KEY",
 		default => "0x7a6d2000",