diff options
-rw-r--r-- | DOCS/man/en/options.rst | 3 | ||||
-rw-r--r-- | mpvcore/options.c | 2 | ||||
-rw-r--r-- | mpvcore/options.h | 1 | ||||
-rw-r--r-- | video/decode/dec_video.c | 18 | ||||
-rw-r--r-- | video/filter/vf_flip.c | 1 | ||||
-rw-r--r-- | video/out/vo_opengl.c | 2 | ||||
-rw-r--r-- | video/out/vo_opengl_old.c | 2 | ||||
-rw-r--r-- | video/out/vo_sdl.c | 2 | ||||
-rw-r--r-- | video/out/vo_vdpau.c | 2 | ||||
-rw-r--r-- | video/vfcap.h | 2 |
10 files changed, 7 insertions, 28 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 962f7c9019..6d8782c38c 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -800,9 +800,6 @@ OPTIONS ``--no-fixed-vo`` enforces closing and reopening the video window for multiple files (one (un)initialization for each file). -``--flip`` - Flip image upside-down. - ``--force-rgba-osd-rendering`` Change how some video outputs render the OSD and text subtitles. This does not change appearance of the subtitles and only has performance diff --git a/mpvcore/options.c b/mpvcore/options.c index 0f9489284f..5ddf38612c 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -499,8 +499,6 @@ const m_option_t mp_opts[] = { OPT_FLOATRANGE("aspect", movie_aspect, 0, -1.0, 10.0), OPT_FLOAT_STORE("no-aspect", movie_aspect, 0, 0.0), - OPT_FLAG_CONSTANTS("flip", flip, 0, 0, 1), - OPT_CHOICE("field-dominance", field_dominance, 0, ({"auto", -1}, {"top", 0}, {"bottom", 1})), diff --git a/mpvcore/options.h b/mpvcore/options.h index 09a39059bb..4057ea882c 100644 --- a/mpvcore/options.h +++ b/mpvcore/options.h @@ -178,7 +178,6 @@ typedef struct MPOpts { struct m_obj_settings *af_settings, *af_defs; int deinterlace; float movie_aspect; - int flip; int field_dominance; char **sub_name; char **sub_paths; diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index bfdeb2c3a7..7b7f7f73fc 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -384,7 +384,6 @@ int mpcodecs_reconfig_vo(struct dec_video *d_video, { struct MPOpts *opts = d_video->opts; vf_instance_t *vf = d_video->vfilter; - int vocfg_flags = 0; struct mp_image_params p = *params; struct sh_video *sh = d_video->header->video; @@ -429,15 +428,6 @@ int mpcodecs_reconfig_vo(struct dec_video *d_video, } d_video->vfilter = vf; - // autodetect flipping - bool flip = opts->flip; - if (flip && !(flags & VFCAP_FLIP)) { - // we need to flip, but no flipping filter avail. - vf_add_before_vo(&vf, "flip", NULL); - d_video->vfilter = vf; - flip = false; - } - float decoder_aspect = p.d_w / (float)p.d_h; if (d_video->initial_decoder_aspect == 0) d_video->initial_decoder_aspect = decoder_aspect; @@ -479,13 +469,11 @@ int mpcodecs_reconfig_vo(struct dec_video *d_video, // Make sure the user-overrides are consistent (no RGB csp for YUV, etc.). mp_image_params_guess_csp(&p); - vocfg_flags = (flip ? VOFLAG_FLIPPING : 0); - // Time to config libvo! - mp_msg(MSGT_CPLAYER, MSGL_V, "VO Config (%dx%d->%dx%d,flags=%d,0x%X)\n", - p.w, p.h, p.d_w, p.d_h, vocfg_flags, p.imgfmt); + mp_msg(MSGT_CPLAYER, MSGL_V, "VO Config (%dx%d->%dx%d,0x%X)\n", + p.w, p.h, p.d_w, p.d_h, p.imgfmt); - if (vf_reconfig_wrapper(vf, &p, vocfg_flags) < 0) { + if (vf_reconfig_wrapper(vf, &p, 0) < 0) { mp_tmsg(MSGT_CPLAYER, MSGL_WARN, "FATAL: Cannot initialize video driver.\n"); d_video->vf_initialized = -1; return -1; diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c index 121503c976..b8d2159196 100644 --- a/video/filter/vf_flip.c +++ b/video/filter/vf_flip.c @@ -34,7 +34,6 @@ static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { - flags &= ~VOFLAG_FLIPPING; // remove the VO flip flag return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 774d87ed05..714bbf4e6b 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -138,7 +138,7 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) static int query_format(struct vo *vo, uint32_t format) { struct gl_priv *p = vo->priv; - int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIP; + int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; if (!gl_video_check_format(p->renderer, format)) return 0; return caps; diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index cd4b6915ca..5ae8816900 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -2039,7 +2039,7 @@ static int query_format(struct vo *vo, uint32_t format) struct mp_imgfmt_desc desc = mp_imgfmt_get_desc(format); int depth = desc.plane_bits; - int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIP; + int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; if (format == IMGFMT_RGB24 || format == IMGFMT_RGBA) return caps; if (p->use_yuv && (desc.flags & MP_IMGFLAG_YUV_P) && diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index 86643788b9..384df54b3a 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -772,7 +772,7 @@ static int query_format(struct vo *vo, uint32_t format) { struct priv *vc = vo->priv; int i, j; - int cap = VFCAP_CSP_SUPPORTED | VFCAP_FLIP; + int cap = VFCAP_CSP_SUPPORTED; for (i = 0; i < vc->renderer_info.num_texture_formats; ++i) for (j = 0; j < sizeof(formats) / sizeof(formats[0]); ++j) if (vc->renderer_info.texture_formats[i] == formats[j].sdl) diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 727fea532f..082ad1a05d 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -1272,7 +1272,7 @@ static int query_format(struct vo *vo, uint32_t format) { struct vdpctx *vc = vo->priv; - int flags = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIP; + int flags = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; if (mp_vdpau_get_format(format, NULL, NULL)) return flags; int rgb_format = get_rgb_format(format); diff --git a/video/vfcap.h b/video/vfcap.h index 186aca5b4a..281a2f3c9d 100644 --- a/video/vfcap.h +++ b/video/vfcap.h @@ -24,7 +24,5 @@ #define VFCAP_CSP_SUPPORTED 0x1 // set, if the given colorspace is supported _without_ conversion #define VFCAP_CSP_SUPPORTED_BY_HW 0x2 -// driver/filter can do vertical flip (upside-down) -#define VFCAP_FLIP 0x80 #endif /* MPLAYER_VFCAP_H */ |