Changeset 4676

Timestamp:

03/06/10 09:07:35 (3 years ago)

Author:

douglask

Message:

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

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

Location:

vic/branches/mpeg4

Files:

• tcl/ui-grabber.tcl (modified) (1 diff)
• video/grabber-decklink.cpp (modified) (2 diffs)

vic/branches/mpeg4/tcl/ui-grabber.tcl

@@ -203 +203 @@
 
     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 {

vic/branches/mpeg4/video/grabber-decklink.cpp

@@ -602 +602 @@
 
     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]);
 
@@ -877 +871 @@
 
     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;