From 4b58d55d90d0a455d04ad9e32b23a5e4b4e1082e Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 7 May 2021 16:25:49 +1000 Subject: [PATCH] scope: ensure texture is updated from channel count too Fixes #1610 --- app/render/videoparams.cpp | 3 ++- app/widget/scope/scopebase/scopebase.cpp | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/render/videoparams.cpp b/app/render/videoparams.cpp index b1529a478..04dff26b0 100644 --- a/app/render/videoparams.cpp +++ b/app/render/videoparams.cpp @@ -163,7 +163,8 @@ bool VideoParams::operator==(const VideoParams &rhs) const && time_base() == rhs.time_base() && format() == rhs.format() && pixel_aspect_ratio() == rhs.pixel_aspect_ratio() - && divider() == rhs.divider(); + && divider() == rhs.divider() + && channel_count() == rhs.channel_count(); } bool VideoParams::operator!=(const VideoParams &rhs) const diff --git a/app/widget/scope/scopebase/scopebase.cpp b/app/widget/scope/scopebase/scopebase.cpp index a12452be9..7540795e9 100644 --- a/app/widget/scope/scopebase/scopebase.cpp +++ b/app/widget/scope/scopebase/scopebase.cpp @@ -67,10 +67,7 @@ void ScopeBase::UploadTextureFromBuffer() if (buffer_) { makeCurrent(); - if (!texture_ - || texture_->width() != buffer_->width() - || texture_->height() != buffer_->height() - || texture_->format() != buffer_->format()) { + if (!texture_ || texture_->params() != buffer_->video_params()) { texture_ = nullptr; managed_tex_ = nullptr;