RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

command: fix confusing displayed aspect-ratio 

For example, when a user switches the aspect-ratio display `16:9`
instead of `1.778` and `Original` instead of `-1.000`.
This commit is contained in:
Abdullah Alansari 2019-12-21 16:25:47 +03:00 committed by wm4
parent 71ddb22b39
commit e6bdd94cb2
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
player/command.c
View File

@ -2583,6 +2583,38 @@ skip_warn: ;
return M_PROPERTY_NOT_IMPLEMENTED; return M_PROPERTY_NOT_IMPLEMENTED;
} }
static bool floats_equal(float x, float y) {
float TOLERANCE = 0.001;
float difference = fabsf(x - y);
return difference <= TOLERANCE;
}
static int mp_property_video_aspect_override(void *ctx, struct m_property *prop,
int action, void *arg)
{
MPContext *mpctx = ctx;
if (action == M_PROPERTY_PRINT) {
float aspect_ratio;
mp_property_generic_option(mpctx, prop, M_PROPERTY_GET, &aspect_ratio);
if (floats_equal(aspect_ratio, 2.35F / 1.0F))
*(char **)arg = talloc_asprintf(NULL, "2.35:1");
else if (floats_equal(aspect_ratio, 16.0F / 9.0F))
*(char **)arg = talloc_asprintf(NULL, "16:9");
else if (floats_equal(aspect_ratio, 16.0F / 10.0F))
*(char **)arg = talloc_asprintf(NULL, "16:10");
else if (floats_equal(aspect_ratio, 4.0F / 3.0F))
*(char **)arg = talloc_asprintf(NULL, "4:3");
else if (floats_equal(aspect_ratio, -1.0F))
*(char **)arg = talloc_asprintf(NULL, "Original");
else
*(char **)arg = talloc_asprintf(NULL, "%.3f", aspect_ratio);
return M_PROPERTY_OK;
}
return mp_property_generic_option(mpctx, prop, action, arg);
}
/// Subtitle delay (RW) /// Subtitle delay (RW)
static int mp_property_sub_delay(void *ctx, struct m_property *prop, static int mp_property_sub_delay(void *ctx, struct m_property *prop,
int action, void *arg) int action, void *arg)
@ -3364,6 +3396,7 @@ static const struct m_property mp_properties_base[] = {
{"container-fps", mp_property_fps}, {"container-fps", mp_property_fps},
{"estimated-vf-fps", mp_property_vf_fps}, {"estimated-vf-fps", mp_property_vf_fps},
{"video-aspect", mp_property_aspect}, {"video-aspect", mp_property_aspect},
{"video-aspect-override", mp_property_video_aspect_override},
{"vid", property_switch_track, .priv = (void *)(const int[]){0, STREAM_VIDEO}}, {"vid", property_switch_track, .priv = (void *)(const int[]){0, STREAM_VIDEO}},
{"hwdec-current", mp_property_hwdec_current}, {"hwdec-current", mp_property_hwdec_current},
{"hwdec-interop", mp_property_hwdec_interop}, {"hwdec-interop", mp_property_hwdec_interop},