leeexin/Velix-MPV-Core
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reapply "demux_mkv: PAR should be calculated after applying crop"

Browse Source 
This reverts commit 81102b0f6c.
This commit is contained in:
Kacper Michajłow committed 2025-03-04 19:33:27 +01:00
1 parent 50cda601ba
commit 403d57dbf3
1 file changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files
demux/demux_mkv.c
+10 -7
View File
@@ -1692,20 +1692,23 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track)
sh_v->disp_w = track->v_width;
sh_v->disp_h = track->v_height;
struct mp_rect crop;
crop.x0 = track->v_crop_left;
crop.y0 = track->v_crop_top;
crop.x1 = track->v_width - track->v_crop_right;
crop.y1 = track->v_height - track->v_crop_bottom;
// Keep the codec crop rect as 0s if we have no cropping since the
// file may have broken width/height tags.
if (track->v_crop_left || track->v_crop_top ||
track->v_crop_right || track->v_crop_bottom)
{
sh_v->crop.x0 = track->v_crop_left;
sh_v->crop.y0 = track->v_crop_top;
sh_v->crop.x1 = track->v_width - track->v_crop_right;
sh_v->crop.y1 = track->v_height - track->v_crop_bottom;
sh_v->crop = crop;
}
int dw = track->v_dwidth_set ? track->v_dwidth : track->v_width;
int dh = track->v_dheight_set ? track->v_dheight : track->v_height;
struct mp_image_params p = {.w = track->v_width, .h = track->v_height};
int dw = track->v_dwidth_set ? track->v_dwidth : mp_rect_w(crop);
int dh = track->v_dheight_set ? track->v_dheight : mp_rect_h(crop);
struct mp_image_params p = {.w = mp_rect_w(crop), .h = mp_rect_h(crop)};
mp_image_params_set_dsize(&p, dw, dh);
sh_v->par_w = p.p_w;
sh_v->par_h = p.p_h;