mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

demux_mkv: fix handling of 0 DisplayWidth/Height

Browse Source 
Commit 546ae23 fixed aspect ratio if the DisplayWidth or DisplayHeight
elements were missing. However, some bogus files [1] can have these
elements present in the file, but set to 0. Use 1:1 pixel aspect for
such files.

[1] https://ffmpeg.org/trac/ffmpeg/ticket/2424
This commit is contained in:
wm4 2013-04-04 01:20:06 +02:00
parent 2ade0951ef
commit 061b99d7b9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demux/demux_mkv.c
View File

@ -92,6 +92,7 @@ typedef struct mkv_track {
int type; int type;
uint32_t v_width, v_height, v_dwidth, v_dheight; uint32_t v_width, v_height, v_dwidth, v_dheight;
bool v_dwidth_set, v_dheight_set;
double v_frate; double v_frate;
uint32_t colorspace; uint32_t colorspace;
@ -538,11 +539,13 @@ static void parse_trackvideo(struct demuxer *demuxer, struct mkv_track *track,
} }
if (video->n_display_width) { if (video->n_display_width) {
track->v_dwidth = video->display_width; track->v_dwidth = video->display_width;
track->v_dwidth_set = true;
mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Display width: %u\n", mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Display width: %u\n",
track->v_dwidth); track->v_dwidth);
} }
if (video->n_display_height) { if (video->n_display_height) {
track->v_dheight = video->display_height; track->v_dheight = video->display_height;
track->v_dheight_set = true;
mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Display height: %u\n", mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Display height: %u\n",
track->v_dheight); track->v_dheight);
} }
@ -1279,8 +1282,8 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track,
if (!track->realmedia) { if (!track->realmedia) {
sh_v->disp_w = track->v_width; sh_v->disp_w = track->v_width;
sh_v->disp_h = track->v_height; sh_v->disp_h = track->v_height;
uint32_t dw = track->v_dwidth ? track->v_dwidth : track->v_width; uint32_t dw = track->v_dwidth_set ? track->v_dwidth : track->v_width;
uint32_t dh = track->v_dheight ? track->v_dheight : track->v_height; uint32_t dh = track->v_dheight_set ? track->v_dheight : track->v_height;
if (dw && dh) if (dw && dh)
sh_v->aspect = (double) dw / dh; sh_v->aspect = (double) dw / dh;
} else { } else {