[Sumover-dev] [svn commit] r4894 - in vic/branches/mpeg4: video

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Mon Dec 13 00:05:31 2010
New Revision: 4894

Modified:
   vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
   vic/branches/mpeg4/tcl/ui-resource.tcl
   vic/branches/mpeg4/video/grabber-win32DS.cpp

Log:
Ignore DirectShow Decklink device

Fix for devices that don't have capture_resolution attribute

Revert to default of de-interlacing.

Modified: vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	Mon Dec 13 00:05:31 2010
@@ -796,8 +796,6 @@
 	if [device_supports $device capture_resolution *] {
 		$capResolutionButton configure -state normal
 		attach_capture_resolutions $device
-	} else {
-		$capResolutionButton configure -state disabled
 	}
 	#set videoFormat $defaultFormat($device)
 	select_format $videoFormat

Modified: vic/branches/mpeg4/tcl/ui-resource.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-resource.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-resource.tcl	Mon Dec 13 00:05:31 2010
@@ -179,7 +179,7 @@
 	option add Vic.infoHighlightColor LightYellow2 startupFile
 	option add Vic.useJPEGforH261 false startupFile
 	option add Vic.useHardwareComp false startupFile
-	option add Vic.useDeinterlacerComp false startupFile
+	option add Vic.useDeinterlacerComp true startupFile
 	option add Vic.stillGrabber false startupFile 
 	option add Vic.fileGrabber false startupFile 
 	option add Vic.siteDropTime "300" startupFile

Modified: vic/branches/mpeg4/video/grabber-win32DS.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-win32DS.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-win32DS.cpp	Mon Dec 13 00:05:31 2010
@@ -1409,14 +1409,18 @@
 			debug_msg("capture filter bound ok= [%d} %s\n", hr, nameBuf);
 			pCaptureFilter[devNum]->GetClassID(&clsid);
 			VariantClear(&varName);
-			if (!IsEqualGUID(clsid,CLSID_VfwCapture)) {
-				pMoniker_->AddRef();
-				debug_msg("Adding capture filter %d\n", hr);
-				devs_[devNum] = new DirectShowDevice(strdup(nameBuf), pCaptureFilter[devNum]);
-			} else {
+			if (IsEqualGUID(clsid,CLSID_VfwCapture)) {
 				debug_msg("discarding an apparent VFW device= %s\n", nameBuf);
 				devs_[devNum] = NULL;
 				pMoniker_->Release();
+			} else if (strcmp(nameBuf, "Decklink Video Capture") == 0) {
+				debug_msg("discarding an DirectShow based Decklink Video Capture\n");
+				devs_[devNum] = NULL;
+				pMoniker_->Release();
+			} else {
+				pMoniker_->AddRef();
+				debug_msg("Adding capture filter %d\n", hr);
+				devs_[devNum] = new DirectShowDevice(strdup(nameBuf), pCaptureFilter[devNum]);
 			}
 			pPropBag->Release();
 		}