Ticket #2267: videoout_quartz.cpp.diff

videoout_quartz.cpp

@@ -176 +176 @@
 
     thePort = NULL;
     desiredWidth = desiredHeight = desiredXoff = desiredYoff = 0;
-    theCodec = NULL;
+    memset(&theCodec, 0, sizeof(theCodec));
     theMask = NULL;
 
     frameSkip = 1;
@@ -272 +272 @@
     if (theCodec)
     {
         CDSequenceEnd(theCodec);
-        theCodec = NULL;
+        memset(&theCodec, 0, sizeof(theCodec));
         if (theMask)
         {
             DisposeRgn(theMask);
@@ -564 +564 @@
     (void)width;
     (void)height;
     (void)aspect;
-
+        (void)av_codec_id;
+        
     // need to redo codec, but not the port
     End();
     Begin();
@@ -1253 +1254 @@
             QString("VideoOutputQuartz::GetRefreshRate() [returning %1]")
                    .arg((int)data->refreshRate));
 
-    return (int)data->refreshRate;
+    return (int) 1000000 / data->refreshRate;
 }
 
 bool VideoOutputQuartz::Init(int width, int height, float aspect,
@@ -1328 +1329 @@
     m = CGDisplayCurrentMode(data->screen);
     data->refreshRate = get_float_CF(m, kCGDisplayRefreshRate);
     if (data->refreshRate == 0.0)       // LCD display?
-        data->refreshRate = 150;
+        data->refreshRate = 60;
 
     // Global configuration options
     data->scaleUpVideo = gContext->GetNumSetting("MacScaleUp", 1);
@@ -1420 +1421 @@
 
 bool VideoOutputQuartz::CreateQuartzBuffers(void)
 {
-    for (int i = 0; i < vbuffers.allocSize(); i++)
+    for (unsigned int i = 0; i < vbuffers.allocSize(); i++)
     {
         vbuffers.at(i)->width  = video_dim.width();
         vbuffers.at(i)->height = video_dim.height();
@@ -1560 +1561 @@
     if (pauseFrame.buf)
         delete [] pauseFrame.buf;
 
-    for (int i = 0; i < vbuffers.allocSize(); i++)
+    for (unsigned int i = 0; i < vbuffers.allocSize(); i++)
     {
         delete [] vbuffers.at(i)->buf;
         vbuffers.at(i)->buf = NULL;