oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

viewer: ensure pixel aspect and interlace parameters are sent to viewer windows too

Browse Source
This commit is contained in:
itsmattkc
2020-08-20 19:34:09 +10:00
parent d99a8e9005
commit 416ba8e2b2
3 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/viewerwindow.cpp
+38 -13
View File
@@ -28,7 +28,8 @@
OLIVE_NAMESPACE_ENTER
ViewerWindow::ViewerWindow(QWidget *parent) :
QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint)
QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint),
pixel_aspect_(1)
{
QVBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0);
@@ -43,23 +44,28 @@ ViewerDisplayWidget *ViewerWindow::display_widget() const
return display_widget_;
}
void ViewerWindow::SetVideoParams(const VideoParams &params)
{
width_ = params.width();
height_ = params.height();
pixel_aspect_ = params.pixel_aspect_ratio();
UpdateMatrix();
}
void ViewerWindow::SetResolution(int width, int height)
{
// Set GL widget matrix to maintain this texture's aspect ratio
double window_ar = static_cast<double>(this->width()) / static_cast<double>(this->height());
double image_ar = static_cast<double>(width) / static_cast<double>(height);
width_ = width;
height_ = height;
QMatrix4x4 mat;
UpdateMatrix();
}
if (window_ar > image_ar) {
// Window is wider than image, adjust X scale
mat.scale(image_ar / window_ar, 1.0f, 1.0f);
} else if (window_ar < image_ar) {
// Window is taller than image, adjust Y scale
mat.scale(1.0f, window_ar / image_ar, 1.0f);
}
void ViewerWindow::SetPixelAspectRatio(const rational &pixel_aspect)
{
pixel_aspect_ = pixel_aspect;
display_widget_->SetMatrix(mat);
UpdateMatrix();
}
void ViewerWindow::Play(const int64_t& start_timestamp, const int& playback_speed, const rational &timebase)
@@ -115,4 +121,23 @@ void ViewerWindow::UpdateFromQueue()
}
}
void ViewerWindow::UpdateMatrix()
{
// Set GL widget matrix to maintain this texture's aspect ratio
double window_ar = static_cast<double>(this->width()) / static_cast<double>(this->height());
double image_ar = static_cast<double>(width_) / static_cast<double>(height_) * pixel_aspect_.toDouble();
QMatrix4x4 mat;
if (window_ar > image_ar) {
// Window is wider than image, adjust X scale
mat.scale(image_ar / window_ar, 1.0f, 1.0f);
} else if (window_ar < image_ar) {
// Window is taller than image, adjust Y scale
mat.scale(1.0f, window_ar / image_ar, 1.0f);
}
display_widget_->SetMatrix(mat);
}
OLIVE_NAMESPACE_EXIT