use correct size with media node

This commit is contained in:
itsmattkc
2019-09-10 12:56:07 +10:00
parent fc4ce3b26e
commit 333d7392d9
10 changed files with 33 additions and 17 deletions
+2 -2
View File
@@ -257,7 +257,7 @@ void RendererProcessor::Start()
threads_.resize(background_thread_count);
for (int i=0;i<threads_.size();i++) {
threads_[i] = std::make_shared<RendererProcessThread>(this, ctx, effective_width_, effective_height_, format_, mode_);
threads_[i] = std::make_shared<RendererProcessThread>(this, ctx, effective_width_, effective_height_, divider_, format_, mode_);
threads_[i]->StartThread(QThread::LowPriority);
// Ensure this connection is "Queued" so that it always runs in this object's threaded rather than any of the
@@ -290,7 +290,7 @@ void RendererProcessor::Start()
for (int i=0;i<download_threads_.size();i++) {
// Create download thread
download_threads_[i] = std::make_shared<RendererDownloadThread>(ctx, effective_width_, effective_height_, format_, mode_);
download_threads_[i] = std::make_shared<RendererDownloadThread>(ctx, effective_width_, effective_height_, divider_, format_, mode_);
download_threads_[i]->StartThread(QThread::LowPriority);
connect(download_threads_[i].get(),
@@ -10,9 +10,10 @@
RendererDownloadThread::RendererDownloadThread(QOpenGLContext *share_ctx,
const int &width,
const int &height,
const int &divider,
const olive::PixelFormat &format,
const olive::RenderMode &mode) :
RendererThreadBase(share_ctx, width, height, format, mode),
RendererThreadBase(share_ctx, width, height, divider, format, mode),
cancelled_(false)
{
}
@@ -9,7 +9,7 @@ class RendererDownloadThread : public RendererThreadBase
public:
RendererDownloadThread(QOpenGLContext* share_ctx,
const int& width,
const int& height,
const int& height, const int &divider,
const olive::PixelFormat& format,
const olive::RenderMode& mode);
@@ -26,9 +26,10 @@ RendererProcessThread::RendererProcessThread(RendererProcessor* parent,
QOpenGLContext *share_ctx,
const int &width,
const int &height,
const int &divider,
const olive::PixelFormat &format,
const olive::RenderMode &mode) :
RendererThreadBase(share_ctx, width, height, format, mode),
RendererThreadBase(share_ctx, width, height, divider, format, mode),
parent_(parent),
cancelled_(false)
{
@@ -32,7 +32,7 @@ public:
RendererProcessThread(RendererProcessor* parent,
QOpenGLContext* share_ctx,
const int& width,
const int& height,
const int& height, const int &divider,
const olive::PixelFormat& format,
const olive::RenderMode& mode);
@@ -22,10 +22,11 @@
#include <QDebug>
RendererThreadBase::RendererThreadBase(QOpenGLContext *share_ctx, const int &width, const int &height, const olive::PixelFormat &format, const olive::RenderMode &mode) :
RendererThreadBase::RendererThreadBase(QOpenGLContext *share_ctx, const int &width, const int &height, const int &divider, const olive::PixelFormat &format, const olive::RenderMode &mode) :
share_ctx_(share_ctx),
width_(width),
height_(height),
divider_(divider),
format_(format),
mode_(mode),
render_instance_(nullptr)
@@ -48,7 +49,7 @@ void RendererThreadBase::run()
wait_cond_.wakeAll();
caller_mutex_.unlock();
RenderInstance instance(width_, height_, format_, mode_);
RenderInstance instance(width_, height_, divider_, format_, mode_);
render_instance_ = &instance;
instance.SetShareContext(share_ctx_);
@@ -36,6 +36,7 @@ public:
RendererThreadBase(QOpenGLContext* share_ctx,
const int& width,
const int& height,
const int& divider,
const olive::PixelFormat& format,
const olive::RenderMode& mode);
@@ -64,6 +65,8 @@ private:
const int& height_;
const int& divider_;
const olive::PixelFormat& format_;
const olive::RenderMode& mode_;