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

video/out/gpu/video: fix chroma offset rotation matrix calculation #15293

Merged
merged 2 commits into from
Nov 11, 2024
Merged

video/out/gpu/video: fix chroma offset rotation matrix calculation #15293

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5f2df3
video/out/gpu/video: prevent OOB access when larger angles are used
na-na-hi Nov 10, 2024
2acc636
video/out/gpu/video: fix chroma offset rotation matrix calculation
na-na-hi Nov 10, 2024
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
17 changes: 9 additions & 8 deletions video/out/gpu/video.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ static int pass_bind(struct gl_video *p, struct image img)
static void get_transform(float w, float h, int rotate, bool flip,
struct gl_transform *out_tr)
{
int a = rotate % 90 ? 0 : rotate / 90;
int a = rotate % 90 ? 0 : (rotate / 90) % 4;
int sin90[4] = {0, 1, 0, -1}; // just to avoid rounding issues etc.
int cos90[4] = {1, 0, -1, 0};
struct gl_transform tr = {{{ cos90[a], sin90[a]},
Expand Down Expand Up @@ -898,7 +898,10 @@ static void pass_get_images(struct gl_video *p, struct video_image *vimg,

if (type == PLANE_CHROMA) {
struct gl_transform rot;
get_transform(0, 0, p->image_params.rotate, true, &rot);
// Reverse the rotation direction here because the different
// coordinate system of chroma offset results in rotation
// in the opposite direction.
get_transform(0, 0, 360 - p->image_params.rotate, t->flipped, &rot);

struct gl_transform tr = chroma;
gl_transform_vec(rot, &tr.t[0], &tr.t[1]);
Expand All @@ -908,15 +911,13 @@ static void pass_get_images(struct gl_video *p, struct video_image *vimg,

// Adjust the chroma offset if the real chroma size is fractional
// due image sizes not aligned to chroma subsampling.
struct gl_transform rot2;
get_transform(0, 0, p->image_params.rotate, t->flipped, &rot2);
if (rot2.m[0][0] < 0)
if (rot.m[0][0] < 0)
tr.t[0] += dx;
if (rot2.m[1][0] < 0)
if (rot.m[1][0] < 0)
tr.t[0] += dy;
if (rot2.m[0][1] < 0)
if (rot.m[0][1] < 0)
tr.t[1] += dx;
if (rot2.m[1][1] < 0)
if (rot.m[1][1] < 0)
tr.t[1] += dy;

off[n] = tr;
Expand Down
Loading