Merge branch 'master' into nodeviewredux

app/widget/curvewidget/curvewidget.cpp

@@ -200,6 +200,8 @@ void CurveWidget::ScaleChangedEvent(const double &scale)
 
 void CurveWidget::TimeTargetChangedEvent(Node *target)
 {
+  ConnectViewerNode(nullptr);
+
   key_control_->SetTimeTarget(target);
 
   view_->SetTimeTarget(target);
@@ -207,6 +209,12 @@ void CurveWidget::TimeTargetChangedEvent(Node *target)
   if (bridge_) {
     bridge_->SetTimeTarget(target);
   }
+
+  // FIXME: If a non-viewer node is ever set here, it will fail to update the length
+  ViewerOutput* viewer = dynamic_cast<ViewerOutput*>(target);
+  if (viewer) {
+    ConnectViewerNode(viewer);
+  }
 }
 
 void CurveWidget::UpdateInputLabel()

app/widget/manageddisplay/manageddisplay.cpp

@@ -142,9 +142,13 @@ void ManagedDisplayWidget::MenuLookSelect(QAction *action)
 
 void ManagedDisplayWidget::SetColorTransform(const ColorTransform &transform)
 {
+  makeCurrent();
+
   color_transform_ = transform;
   SetupColorProcessor();
   ColorProcessorChangedEvent();
+
+  doneCurrent();
 }
 
 void ManagedDisplayWidget::initializeGL()
@@ -248,9 +252,7 @@ void ManagedDisplayWidget::SetupColorProcessor()
                                                     color_manager_->GetReferenceColorSpace(),
                                                     color_transform_);
 
-      makeCurrent();
       color_service_->Enable(context(), true);
-      doneCurrent();
 
     } catch (OCIO::Exception& e) {
 

app/widget/nodeparamview/nodeparamview.cpp

@@ -156,7 +156,9 @@ void NodeParamView::SetNodes(QList<Node *> nodes)
 
       items_.append(item);
 
-      QTimer::singleShot(1, item, &NodeParamViewItem::SignalAllKeyframes);
+      QMetaObject::invokeMethod(item,
+                                "SignalAllKeyframes",
+                                Qt::QueuedConnection);
 
       emit OpenedNode(node);
     }
@@ -218,6 +220,11 @@ const QList<Node *> &NodeParamView::nodes()
   return nodes_;
 }
 
+Node *NodeParamView::GetTimeTarget() const
+{
+  return keyframe_view_->GetTimeTarget();
+}
+
 void NodeParamView::UpdateItemTime(const int64_t &timestamp)
 {
   rational time = Timecode::timestamp_to_time(timestamp, keyframe_view_->timebase());

app/widget/nodeparamview/nodeparamview.h

@@ -40,6 +40,8 @@ public:
   void SetNodes(QList<Node*> nodes);
   const QList<Node*>& nodes();
 
+  Node* GetTimeTarget() const;
+
 signals:
   void InputDoubleClicked(NodeInput* input);
 

app/widget/scope/histogram/histogram.cpp

@@ -49,7 +49,9 @@ void HistogramScope::SetBuffer(Frame* frame)
 {
   buffer_ = frame;
 
-  StartUpdate();
+  if (isVisible()) {
+    StartUpdate();
+  }
 }
 
 void HistogramScope::FinishedProcessing(QVector<double> red, QVector<double> green, QVector<double> blue)
@@ -111,6 +113,13 @@ void HistogramScope::StartUpdate()
   }
 }
 
+void HistogramScope::showEvent(QShowEvent* e)
+{
+  ManagedDisplayWidget::showEvent(e);
+
+  StartUpdate();
+}
+
 HistogramScopeWorker::HistogramScopeWorker() :
   cancelled_(false)
 {

app/widget/scope/histogram/histogram.h

@@ -78,6 +78,8 @@ protected:
 
   virtual void ColorProcessorChangedEvent() override;
 
+  virtual void showEvent(QShowEvent* e) override;
+
 private:
   void StartUpdate();
 

app/widget/scope/waveform/waveform.cpp

@@ -28,16 +28,32 @@ OLIVE_NAMESPACE_ENTER
 
 WaveformScope::WaveformScope(QWidget* parent) :
   ManagedDisplayWidget(parent),
-  texture_(nullptr)
+  buffer_(nullptr)
 {
   EnableDefaultContextMenu();
 }
 
-void WaveformScope::SetTexture(OpenGLTexture *texture)
+WaveformScope::~WaveformScope()
 {
-  texture_ = texture;
+  CleanUp();
 
-  update();
+  if (context()) {
+    disconnect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &WaveformScope::CleanUp);
+  }
+}
+
+void WaveformScope::SetBuffer(Frame *frame)
+{
+  buffer_ = frame;
+
+  UploadTextureFromBuffer();
+}
+
+void WaveformScope::showEvent(QShowEvent* e)
+{
+  ManagedDisplayWidget::showEvent(e);
+
+  UploadTextureFromBuffer();
 }
 
 void WaveformScope::initializeGL()
@@ -49,37 +65,99 @@ void WaveformScope::initializeGL()
   pipeline_->addShaderFromSourceCode(QOpenGLShader::Vertex, OpenGLShader::CodeDefaultVertex());
   pipeline_->addShaderFromSourceCode(QOpenGLShader::Fragment, Node::ReadFileAsString(":/shaders/rgbwaveform.frag"));
   pipeline_->link();
+
+  framebuffer_.Create(context());
+
+  connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &WaveformScope::CleanUp, Qt::DirectConnection);
+
+  UploadTextureFromBuffer();
 }
 
 void WaveformScope::paintGL()
 {
-  context()->functions()->glClearColor(0, 0, 0, 0);
-  context()->functions()->glClear(GL_COLOR_BUFFER_BIT);
+  QOpenGLFunctions* f = context()->functions();
 
-  if (!pipeline_ || !texture_) {
+  f->glClearColor(0, 0, 0, 0);
+  f->glClear(GL_COLOR_BUFFER_BIT);
+
+  if (!pipeline_ || !texture_.IsCreated()) {
     return;
   }
 
-  pipeline_->bind();
-  pipeline_->setUniformValue("ove_resolution", texture_->width(), texture_->height());
-  pipeline_->setUniformValue("ove_viewport", width(), height());
+  {
+    // Convert reference frame to display space
+    framebuffer_.Attach(&managed_tex_);
+    framebuffer_.Bind();
 
-  // The general size of a pixel
-  pipeline_->setUniformValue("threshold", 2.0f / static_cast<float>(height()));
+    texture_.Bind();
 
-  pipeline_->release();
+    f->glViewport(0, 0, texture_.width(), texture_.height());
 
-  texture_->Bind();
+    color_service()->ProcessOpenGL();
 
-  OpenGLRenderFunctions::Blit(pipeline_);
+    texture_.Release();
 
-  texture_->Release();
+    framebuffer_.Release();
+    framebuffer_.Detach();
+  }
+
+  {
+    // Draw waveform through shader
+    pipeline_->bind();
+    pipeline_->setUniformValue("ove_resolution", texture_.width(), texture_.height());
+    pipeline_->setUniformValue("ove_viewport", width(), height());
+
+    // The general size of a pixel
+    pipeline_->setUniformValue("threshold", 2.0f / static_cast<float>(height()));
+
+    pipeline_->release();
+
+    f->glViewport(0, 0, width(), height());
+
+    managed_tex_.Bind();
+
+    OpenGLRenderFunctions::Blit(pipeline_);
+
+    managed_tex_.Release();
+  }
+}
+
+void WaveformScope::UploadTextureFromBuffer()
+{
+  if (!buffer_ || !isVisible()) {
+    return;
+  }
+
+  makeCurrent();
+
+  if (!texture_.IsCreated()
+      || texture_.width() != buffer_->width()
+      || texture_.height() != buffer_->height()
+      || texture_.format() != buffer_->format()) {
+    texture_.Destroy();
+    managed_tex_.Destroy();
+
+    texture_.Create(context(), buffer_);
+    managed_tex_.Create(context(), buffer_->width(), buffer_->height(), buffer_->format());
+  } else {
+    texture_.Upload(buffer_);
+  }
+
+  doneCurrent();
+
+  update();
 }
 
 void WaveformScope::CleanUp()
 {
+  makeCurrent();
+
   pipeline_ = nullptr;
-  texture_ = nullptr;
+  texture_.Destroy();
+  managed_tex_.Destroy();
+  framebuffer_.Destroy();
+
+  doneCurrent();
 }
 
 OLIVE_NAMESPACE_EXIT

app/widget/scope/waveform/waveform.h

@@ -23,6 +23,7 @@
 
 #include "codec/frame.h"
 #include "render/backend/opengl/openglcolorprocessor.h"
+#include "render/backend/opengl/openglframebuffer.h"
 #include "render/backend/opengl/openglshader.h"
 #include "render/backend/opengl/opengltexture.h"
 #include "widget/manageddisplay/manageddisplay.h"
@@ -35,18 +36,30 @@ class WaveformScope : public ManagedDisplayWidget
 public:
   WaveformScope(QWidget* parent = nullptr);
 
+  virtual ~WaveformScope() override;
+
 public slots:
-  void SetTexture(OpenGLTexture* texture);
+  void SetBuffer(Frame* frame);
 
 protected:
   virtual void initializeGL() override;
 
   virtual void paintGL() override;
 
+  virtual void showEvent(QShowEvent* e) override;
+
 private:
+  void UploadTextureFromBuffer();
+
   OpenGLShaderPtr pipeline_;
 
-  OpenGLTexture* texture_;
+  OpenGLTexture texture_;
+
+  OpenGLTexture managed_tex_;
+
+  OpenGLFramebuffer framebuffer_;
+
+  Frame* buffer_;
 
 private slots:
   void CleanUp();

app/widget/viewer/manageddisplayobject.cpp

@@ -1,6 +0,0 @@
-#include "manageddisplayobject.h"
-
-ManagedDisplayObject::ManagedDisplayObject()
-{
-
-}

app/widget/viewer/manageddisplayobject.h

@@ -1,11 +0,0 @@
-#ifndef MANAGEDDISPLAYOBJECT_H
-#define MANAGEDDISPLAYOBJECT_H
-
-
-class ManagedDisplayObject
-{
-public:
-  ManagedDisplayObject();
-};
-
-#endif // MANAGEDDISPLAYOBJECT_H

app/widget/viewer/viewer.cpp

@@ -66,8 +66,6 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
   connect(main_widget, &ViewerDisplayWidget::customContextMenuRequested, this, &ViewerWidget::ShowContextMenu);
   connect(main_widget, &ViewerDisplayWidget::CursorColor, this, &ViewerWidget::CursorColor);
   connect(main_widget, &ViewerDisplayWidget::LoadedBuffer, this, &ViewerWidget::LoadedBuffer);
-  connect(main_widget, &ViewerDisplayWidget::LoadedTexture, this, &ViewerWidget::LoadedTexture);
-  connect(main_widget, &ViewerDisplayWidget::DrewManagedTexture, this, &ViewerWidget::DrewManagedTexture);
   connect(main_widget, &ViewerDisplayWidget::ColorProcessorChanged, this, &ViewerWidget::ColorProcessorChanged);
   connect(main_widget, &ViewerDisplayWidget::ColorManagerChanged, this, &ViewerWidget::ColorManagerChanged);
   connect(sizer_, &ViewerSizer::RequestMatrix, main_widget, &ViewerDisplayWidget::SetMatrix);
@@ -745,11 +743,6 @@ void ViewerWidget::SetSignalCursorColorEnabled(bool e)
   }
 }
 
-void ViewerWidget::SetEmitDrewManagedTextureEnabled(bool e)
-{
-  main_gl_widget()->SetEmitDrewManagedTextureEnabled(e);
-}
-
 void ViewerWidget::TimebaseChangedEvent(const rational &timebase)
 {
   TimeBasedWidget::TimebaseChangedEvent(timebase);

app/widget/viewer/viewer.h

@@ -107,11 +107,6 @@ public slots:
    */
   void SetSignalCursorColorEnabled(bool e);
 
-  /**
-   * @brief Wrapper for ViewerGLWidget::SetEmitDrewManagedTextureEnabled()
-   */
-  void SetEmitDrewManagedTextureEnabled(bool e);
-
 signals:
   /**
    * @brief Wrapper for ViewerGLWidget::CursorColor()
@@ -123,16 +118,6 @@ signals:
    */
   void LoadedBuffer(Frame* load_buffer);
 
-  /**
-   * @brief Wrapper for ViewerGLWidget::LoadedTexture()
-   */
-  void LoadedTexture(OpenGLTexture* texture);
-
-  /**
-   * @brief Wrapper for ViewerGLWidget::DrewManagedTexture()
-   */
-  void DrewManagedTexture(OpenGLTexture* texture);
-
   /**
    * @brief Request a scope panel
    *

app/widget/viewer/viewerdisplay.cpp

@@ -42,10 +42,8 @@ bool ViewerDisplayWidget::nouveau_check_done_ = false;
 
 ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) :
   ManagedDisplayWidget(parent),
-  managed_copy_pipeline_(nullptr),
   has_image_(false),
-  signal_cursor_color_(false),
-  enable_display_referred_signal_(false)
+  signal_cursor_color_(false)
 {
 }
 
@@ -91,14 +89,12 @@ void ViewerDisplayWidget::SetImage(const QString &fn)
       input->read_image(input->spec().format, load_buffer_.data(), OIIO::AutoStride, load_buffer_.linesize_bytes());
       input->close();
 
-      emit LoadedBuffer(&load_buffer_);
-
-      texture_.Upload(load_buffer_.data(), load_buffer_.linesize_pixels());
-
-      emit LoadedTexture(&texture_);
+      texture_.Upload(&load_buffer_);
 
       doneCurrent();
 
+      emit LoadedBuffer(&load_buffer_);
+
       has_image_ = true;
 
 #if OIIO_VERSION < 10903
@@ -138,7 +134,7 @@ void ViewerDisplayWidget::SetImageFromLoadBuffer(Frame *in_buffer)
         || texture_.format() != in_buffer->format()) {
       texture_.Create(context(), in_buffer->width(), in_buffer->height(), in_buffer->format(), in_buffer->data(), load_buffer_.linesize_pixels());
     } else {
-      texture_.Upload(in_buffer->data(), load_buffer_.linesize_pixels());
+      texture_.Upload(in_buffer);
     }
 
     doneCurrent();
@@ -147,18 +143,6 @@ void ViewerDisplayWidget::SetImageFromLoadBuffer(Frame *in_buffer)
   update();
 }
 
-void ViewerDisplayWidget::SetEmitDrewManagedTextureEnabled(bool e)
-{
-  enable_display_referred_signal_ = e;
-
-  if (!enable_display_referred_signal_) {
-    // Destroy the texture now
-    managed_texture_.Destroy();
-    managed_copy_pipeline_ = nullptr;
-    framebuffer_.Destroy();
-  }
-}
-
 void ViewerDisplayWidget::ConnectSibling(ViewerDisplayWidget *sibling)
 {
   connect(this, &ViewerDisplayWidget::LoadedBuffer, sibling, &ViewerDisplayWidget::SetImageFromLoadBuffer, Qt::QueuedConnection);
@@ -243,33 +227,6 @@ void ViewerDisplayWidget::paintGL()
   // We only draw if we have a pipeline
   if (has_image_ && color_service() && texture_.IsCreated()) {
 
-    // If we're distributing our display-referred final buffer, we'll have to make a copy of it
-    if (enable_display_referred_signal_) {
-
-      if (!managed_texture_.IsCreated()
-          || managed_texture_.width() != texture_.width()
-          || managed_texture_.height() != texture_.height()
-          || managed_texture_.format() != texture_.format()) {
-        managed_texture_.Destroy();
-
-        managed_texture_.Create(context(), texture_.width(), texture_.height(), texture_.format());
-      }
-
-      if (!managed_copy_pipeline_) {
-        managed_copy_pipeline_ = OpenGLShader::CreateDefault();
-      }
-
-      if (!framebuffer_.IsCreated()) {
-        framebuffer_.Create(context());
-      }
-
-      framebuffer_.Attach(&managed_texture_);
-      framebuffer_.Bind();
-
-      f->glViewport(0, 0, managed_texture_.width(), managed_texture_.height());
-
-    }
-
     // Bind retrieved texture
     f->glBindTexture(GL_TEXTURE_2D, texture_.texture());
 
@@ -279,24 +236,6 @@ void ViewerDisplayWidget::paintGL()
     // Release retrieved texture
     f->glBindTexture(GL_TEXTURE_2D, 0);
 
-    if (enable_display_referred_signal_) {
-
-      framebuffer_.Release();
-      framebuffer_.Detach();
-
-      emit DrewManagedTexture(&managed_texture_);
-
-      // Bind retrieved texture
-      managed_texture_.Bind();
-
-      f->glViewport(0, 0, width(), height());
-
-      OpenGLRenderFunctions::Blit(managed_copy_pipeline_);
-
-      // Bind retrieved texture
-      managed_texture_.Release();
-
-    }
   }
 
   // Draw action/title safe areas
@@ -348,10 +287,7 @@ void ViewerDisplayWidget::ContextCleanup()
 {
   makeCurrent();
 
-  managed_copy_pipeline_ = nullptr;
   texture_.Destroy();
-  managed_texture_.Destroy();
-  framebuffer_.Destroy();
 
   doneCurrent();
 }

app/widget/viewer/viewerdisplay.h

@@ -101,15 +101,6 @@ public slots:
    */
   void SetImageFromLoadBuffer(Frame* in_buffer);
 
-  /**
-   * @brief Enables or disables DrewManagedTexture()
-   *
-   * To emit a display referred texture, it needs to be copied after the color transform is complete. This naturally
-   * adds extra GPU cycles that are wasted if there's nothing receiving the signal. Therefore, the signal is disabled
-   * by default.
-   */
-  void SetEmitDrewManagedTextureEnabled(bool e);
-
 signals:
   /**
    * @brief Signal emitted when the user starts dragging from the viewer
@@ -130,18 +121,6 @@ signals:
    */
   void LoadedBuffer(Frame* load_buffer);
 
-  /**
-   * @brief Signal emitted when a buffer is loaded into a texture
-   *
-   * This texture will be the direct output of the renderer in reference space in GPU VRAM.
-   */
-  void LoadedTexture(OpenGLTexture* texture);
-
-  /**
-   * @brief Emitted when the a texture has been transformed to display
-   */
-  void DrewManagedTexture(OpenGLTexture* texture);
-
 protected:
   /**
    * @brief Override the mouse press event simply to emit the DragStarted() signal
@@ -173,23 +152,6 @@ private:
    */
   OpenGLTexture texture_;
 
-  /**
-   * @brief Internal framebuffer used to draw to managed_texture_
-   */
-  OpenGLFramebuffer framebuffer_;
-
-  /**
-   * @brief Internal referenceto the OpenGL texture that's been managed
-   *
-   * Kept so that scopes can use the display-referred buffer without having to transform again.
-   */
-  OpenGLTexture managed_texture_;
-
-  /**
-   * @brief Pipeline used to draw to managed_texture_
-   */
-  OpenGLShaderPtr managed_copy_pipeline_;
-
   /**
    * @brief Drawing matrix (defaults to identity)
    */
@@ -210,8 +172,6 @@ private:
 
   ViewerSafeMarginInfo safe_margin_;
 
-  bool enable_display_referred_signal_;
-
 private slots:
   /**
    * @brief Slot to connect just before the OpenGL context is destroyed to clean up resources