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

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

Author: douglask
Date: Sat Mar  6 09:07:35 2010
New Revision: 4676

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

Log:
Invoke restart command when a software radio button resize button is pressed.

Fix for non-CIF/QCIF "normal" and "small" captures


Modified: vic/branches/mpeg4/tcl/ui-grabber.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-grabber.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-grabber.tcl	Sat Mar  6 09:07:35 2010
@@ -202,15 +202,15 @@
     label $w.f.scaling -text "Software Scaling : "
 
     if {$::tk_version > 8.4 && [windowingsystem] != "x11"} {
-        ttk::radiobutton $w.f.b0 -text "none" -command "grabber setSoftwareScale none" \
+        ttk::radiobutton $w.f.b0 -text "none" -command "restart" \
            -variable setSoftwareScale -value "none"
-        ttk::radiobutton $w.f.b1 -text "960p" -command "grabber setSoftwareScale 960p" \
+        ttk::radiobutton $w.f.b1 -text "960p" -command "restart" \
             -variable setSoftwareScale -value "960p"
-        ttk::radiobutton $w.f.b2 -text "720p" -command "grabber setSoftwareScale 720p" \
+        ttk::radiobutton $w.f.b2 -text "720p" -command "restart" \
             -variable setSoftwareScale -value "720p"
-        ttk::radiobutton $w.f.b3 -text "576p" -command "grabber setSoftwareScale 576p" \
+        ttk::radiobutton $w.f.b3 -text "576p" -command "restart" \
             -variable setSoftwareScale -value "576p"
-        ttk::radiobutton $w.f.b4 -text "480p" -command "grabber setSoftwareScale 480p" \
+        ttk::radiobutton $w.f.b4 -text "480p" -command "restart" \
             -variable setSoftwareScale -value "480p"
     } else {
         set f [smallfont]

Modified: vic/branches/mpeg4/video/grabber-decklink.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-decklink.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-decklink.cpp	Sat Mar  6 09:07:35 2010
@@ -601,13 +601,7 @@
     HRESULT result;
 
     if (argc == 3) {
-        if (strcmp(argv[1], "setSoftwareScale") == 0) {
-            if (running_) {
-                stop(); start();
-            }
-            return (TCL_OK);
-
-        } else if (strcmp(argv[1], "decimate") == 0) {
+        if (strcmp(argv[1], "decimate") == 0) {
             decimate_ = atoi(argv[2]);
 
             if (running_) {
@@ -876,18 +870,11 @@
         break;
 
     case 2: // CIF-size
-        if (cformat_ == CF_422) {
-            planarYUYV422_to_planarYUYV422((char *)frame_, CIF_WIDTH, CIF_HEIGHT, (char *)fr, width_, height_);
-        } else {
-            planarYUYV420_to_planarYUYV420((char *)frame_, CIF_WIDTH, CIF_HEIGHT, (char *)fr, width_, height_);
-        }
-        break;
-
     case 4: // QCIF-size
         if (cformat_ == CF_422) {
-            planarYUYV422_to_planarYUYV422((char *)frame_, QCIF_WIDTH, QCIF_HEIGHT, (char *)fr, width_, height_);
+            planarYUYV422_to_planarYUYV422((char *)frame_, outw_, outh_, (char *)fr, width_, height_);
         } else {
-            planarYUYV420_to_planarYUYV420((char *)frame_, QCIF_WIDTH, QCIF_HEIGHT, (char *)fr, width_, height_);
+            planarYUYV420_to_planarYUYV420((char *)frame_, outw_, outh_, (char *)fr, width_, height_);
         }
         break;
     }