Mercurial > mplayer.hg
comparison libmpdemux/demux_mkv.c @ 36316:139f2b064ef9
Don't subsequently calculate original_aspect from last movie_aspect.
Instead, differentiate between the original aspect ratio stored in or
determined from the video file and the forced, i.e. current, aspect
ratio (e.g. forced by command line override).
This enables multiple independent instances of vd.c again which has
been broken by introducing a static variable in r36401.
Without the subsequent calculation of original_aspect it now contains
nothing but the pure video file aspect ratio which makes it possible
to use movie_aspect -1 to set the original aspect ratio which explains
the changes in command.c and gui/dialog/menu.c.
The changes in vd_mpegpes due to the impact of original_aspect will
fix a bug there at the same time where the condition in order to call
mpcodecs_config_vo() should only trigger once when the encoded aspect
changes. So far, the forced, i.e. current, aspect has been checked.
The whole is related to enabling special argument -1 to switch_ratio
started in r36391.
author | ib |
---|---|
date | Wed, 07 Aug 2013 20:41:34 +0000 |
parents | 34c05e3ea263 |
children | 9222b4fbe1c8 |
comparison
equal
deleted
inserted
replaced
36315:e4ab2ab9eede | 36316:139f2b064ef9 |
---|---|
1616 sh_v->format = sh_v->bih->biCompression; | 1616 sh_v->format = sh_v->bih->biCompression; |
1617 if (track->v_frate == 0.0) | 1617 if (track->v_frate == 0.0) |
1618 track->v_frate = 25.0; | 1618 track->v_frate = 25.0; |
1619 sh_v->fps = track->v_frate; | 1619 sh_v->fps = track->v_frate; |
1620 sh_v->frametime = 1 / track->v_frate; | 1620 sh_v->frametime = 1 / track->v_frate; |
1621 sh_v->aspect = 0; | 1621 sh_v->original_aspect = 0; |
1622 if (!track->realmedia) { | 1622 if (!track->realmedia) { |
1623 sh_v->disp_w = track->v_width; | 1623 sh_v->disp_w = track->v_width; |
1624 sh_v->disp_h = track->v_height; | 1624 sh_v->disp_h = track->v_height; |
1625 if (track->v_dheight) | 1625 if (track->v_dheight) |
1626 sh_v->aspect = (float) track->v_dwidth / (float) track->v_dheight; | 1626 sh_v->original_aspect = (float) track->v_dwidth / (float) track->v_dheight; |
1627 } else { | 1627 } else { |
1628 // vd_realvid.c will set aspect to disp_w/disp_h and rederive | 1628 // vd_realvid.c will set aspect to disp_w/disp_h and rederive |
1629 // disp_w and disp_h from the RealVideo stream contents returned | 1629 // disp_w and disp_h from the RealVideo stream contents returned |
1630 // by the Real DLLs. If DisplayWidth/DisplayHeight was not set in | 1630 // by the Real DLLs. If DisplayWidth/DisplayHeight was not set in |
1631 // the Matroska file then it has already been set to PixelWidth/Height | 1631 // the Matroska file then it has already been set to PixelWidth/Height |