Make Show2 hide its window if finalize is called, fix a video reading problem

Make show2 hide its window if finalize is called, also change the update image signal to a blocking type to allow this to work correctly (this will actually lock the frame rate of a stream to whatever speed qt can update windows at, so maybe should be optional) After calling VideoCapture::read, make a clone of the returned matrix since it has become clear that in at least some cases, the returned matrix is an alias of some internal buffer of the VideoCapture.

Make Show2 hide its window if finalize is called, fix a video reading problem
Make show2 hide its window if finalize is called, also change the update image signal to a blocking type to allow this to work correctly (this will actually lock the frame rate of a stream to whatever speed qt can update windows at, so maybe should be optional) After calling VideoCapture::read, make a clone of the returned matrix since it has become clear that in at least some cases, the returned matrix is an alias of some internal buffer of the VideoCapture.
Charles Otto
1 parent e41031d2
Showing 2 changed files with 5 additions and 3 deletions
openbr/plugins/gui.cpp
openbr/plugins/stream.cpp
@@ -132,7 +132,7 @@ public:
         gui->moveToThread(QApplication::instance()->thread());
         // Connect our signals to the proxy's slots
         connect(this, SIGNAL(needWindow()), gui, SLOT(createWindow()), Qt::BlockingQueuedConnection);
-        connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)));
+        connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)), Qt::BlockingQueuedConnection);
     }
  
     ~Show2Transform()
@@ -159,7 +159,6 @@ public:
             // build label
             QString newTitle;
             foreach (const QString & s, keys) {
-
                 if (t.file.contains(s)) {
                     QString out = t.file.get<QString>(s);
                     newTitle = newTitle + s + ": " + out + " ";
@@ -188,7 +187,8 @@ public:
     void finalize(TemplateList & output)
     {
         (void) output;
-        // todo: hide window?
+        if (gui && gui->window)
+            gui->window->hide();
     }
  
     void init()
@@ -295,6 +295,8 @@ private:
         next_idx++;
  
         bool res = video.read(output.data.last().last());
+        output.data.last().last() = output.data.last().last().clone();
+
         if (!res) {
             video_ok = false;
             return video_ok;