[Sumover-dev] [svn commit] r4717 - vic/branches/cc/video

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

Author: soohyunc
Date: Tue Mar 23 20:22:31 2010
New Revision: 4717

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

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



Modified: vic/branches/cc/video/grabber-macosx.cpp
==============================================================================
--- vic/branches/cc/video/grabber-macosx.cpp	(original)
+++ vic/branches/cc/video/grabber-macosx.cpp	Tue Mar 23 20:22:31 2010
@@ -224,6 +224,8 @@
 	
     // Don't do anything if QuickTime failed.
     if (!quicktime_) return;
+
+	format();
 	
     // start the sequencer
     err = SGStartRecord(seqGrab);
@@ -403,9 +405,9 @@
 			
         } 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) {
         fprintf(stderr, "QuickTime error[%d]: %s\n", err, e.string);
@@ -449,15 +451,13 @@
 }
 
 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);
 
 		} else if (strcmp(argv[1], "port") == 0) {
@@ -476,6 +476,10 @@
 			else
 				input_standard_ = ntscIn;
 
+			if(running_) {
+				stop(); start();
+			}
+
 			return(TCL_OK);
 
         } else if (strcmp(argv[1], "useconfig") == 0) {