Changeset 4717

Timestamp:

03/23/10 20:22:31 (3 years ago)

Author:

soohyunc

Message:

Updated grabber-macosx.cpp (-- copied from mpeg4 branch)

Files:

• vic/branches/cc/video/grabber-macosx.cpp (modified) (4 diffs)

vic/branches/cc/video/grabber-macosx.cpp

@@ -225 +225 @@
     // Don't do anything if QuickTime failed.
     if (!quicktime_) return;
+
+        format();
         
     // start the sequencer
@@ -404 +406 @@
         } else {
                         fprintf(stderr, "      format() - reformat not implemented!\n");
-                        //            UnlockPixels(GetGWorldPixMap(gWorld_));
-                        //            UpdateGWorld(&gWorld_, kYUVUPixelFormat, &frameRect_, 0, NULL, 0);
-                        //            if (!LockPixels(GetGWorldPixMap(gWorld_))) throw Exception("LockPixels");
+                        UnlockPixels(GetGWorldPixMap(gWorld_));
+                        UpdateGWorld(&gWorld_, kYUVUPixelFormat, &frameRect_, 0, NULL, 0);
+                        if (!LockPixels(GetGWorldPixMap(gWorld_))) throw Exception("LockPixels");
         }
     } catch (Exception e) {
@@ -450 +452 @@
 
 int MacOSXGrabber::command(int argc, const char*const* argv) {
-    // fprintf(stderr,"### MacOSXGrabber::command : argv[1] = %s\n", argv[1]);
+    //fprintf(stderr,"### MacOSXGrabber::command : argv[1] = %s\n", argv[1]);
     if (argc == 3) {
                 if (strcmp(argv[1], "decimate") == 0) {
                         decimate_ = atoi(argv[2]);
                         if (running_) {
-                                stop();
+                                stop(); start();
                         }
-                        format();
-                        start();
                         return(TCL_OK);
 
@@ -476 +476 @@
                         else
                                 input_standard_ = ntscIn;
+
+                        if(running_) {
+                                stop(); start();
+                        }
 
                         return(TCL_OK);