From 38d35d1b8884c4e67fa7ba1dfae687217ffe0c6d Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 20 Dec 2019 04:38:19 +1100 Subject: [PATCH] updated viewer to set render backend format/mode Yes, it's still hardcoded in the viewer for the time being, but moving it out of the backend makes the backend format flexible for exporting. --- app/widget/viewer/viewer.cpp | 8 ++++++++ app/widget/viewer/viewer.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp index 1d4932c87..26ce5e63d 100644 --- a/app/widget/viewer/viewer.cpp +++ b/app/widget/viewer/viewer.cpp @@ -167,7 +167,10 @@ void ViewerWidget::ConnectViewerNode(ViewerOutput *node) } video_renderer_->SetViewerNode(viewer_node_); + video_renderer_->SetParameters(VideoRenderingParams(viewer_node_->video_params(), olive::PIX_FMT_RGBA16F, olive::kOffline, 2)); + audio_renderer_->SetViewerNode(viewer_node_); + audio_renderer_->SetParameters(AudioRenderingParams(viewer_node_->audio_params(), SAMPLE_FMT_FLT)); } void ViewerWidget::DisconnectViewerNode() @@ -195,6 +198,11 @@ void ViewerWidget::SetMatrix(const QMatrix4x4 &mat) gl_widget_->SetMatrix(mat); } +VideoRenderBackend *ViewerWidget::video_renderer() const +{ + return video_renderer_; +} + void ViewerWidget::SetTexture(OpenGLTexturePtr tex) { if (tex == nullptr) { diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h index 7b2b930de..caac4cd40 100644 --- a/app/widget/viewer/viewer.h +++ b/app/widget/viewer/viewer.h @@ -75,6 +75,8 @@ public: void SetMatrix(const QMatrix4x4& mat); + VideoRenderBackend* video_renderer() const; + public slots: /** * @brief Set the texture to draw and draw it