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

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

Author: douglask
Date: Mon Feb 22 09:20:56 2010
New Revision: 4632

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

Log:
Disable the normal/medium button for devices that can only capture 'large'.


Modified: vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	Mon Feb 22 09:20:56 2010
@@ -763,6 +763,11 @@
 	} else {
 		$sizeButtons.b0 configure -state disabled
 	}
+        if { [device_supports $device size normal] || [device_supports $device size cif] } {
+		$sizeButtons.b1 configure -state normal
+	} else {
+		$sizeButtons.b1 configure -state disabled
+	}
 	if [device_supports $device size large] {
 		$sizeButtons.b2 configure -state normal
 	} else {

Modified: vic/branches/mpeg4/video/grabber-decklink.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-decklink.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-decklink.cpp	Mon Feb 22 09:20:56 2010
@@ -342,8 +342,8 @@
         return;
     }
 
-    strcpy(attr,"format { 420 422 cif } ");
-    strcat(attr,"size { small large cif } ");
+    strcpy(attr,"format { 420 422 } ");
+    strcat(attr,"size { large } ");
 
     strcat(attr,"port { ");
 
@@ -718,7 +718,6 @@
         return 0;
     }
 
-    // Need to fix, should do HDYC (a packed UYVY variation) to YUYV instead
     switch (cformat_) {
     case CF_420:
     case CF_CIF: