Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

viewertexteditor: Fix incorrect text rendering when pixel aspect ratio not 1 #2084

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

viewertexteditor: Fix incorrect text rendering when pixel aspect ratio not 1 #2084

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adf1021
viewertexteditor: Fix incorrect text rendering when pixel aspect rati…
Nov 2, 2022
802860d
Change variable name to pixel_aspect_ratio
p9malino26 Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/node/generator/text/textv3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,12 @@ void TextGeneratorV3::GenerateFrame(FramePtr frame, const GenerateJob& job) cons

// Draw rich text onto image
QPainter p(&img);
p.scale(1.0 / frame->video_params().divider(), 1.0 / frame->video_params().divider());
const double par = frame->video_params().pixel_aspect_ratio().toDouble();
Copy link
Collaborator

@ThomasWilshaw ThomasWilshaw Feb 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Long explicit names are prefered so something like pixel_aspect_ratio would be better

p.scale(1.0 / frame->video_params().divider() / par, 1.0 / frame->video_params().divider());

QVector2D pos = job.Get(kPositionInput).toVec2();
p.translate(pos.x() - size.x()/2, pos.y() - size.y()/2);
p.translate(frame->video_params().width()/2, frame->video_params().height()/2);
p.translate(frame->video_params().width()/2 * par, frame->video_params().height()/2);
p.setClipRect(0, 0, size.x(), size.y());

switch (static_cast<VerticalAlignment>(job.Get(kVerticalAlignmentInput).toInt())) {
Expand Down