video: remove vf_pp auto-insertion

This drops the --pp option, which was probably broken for a while. The
option automatically inserted the "pp" filter. The value passed to it
was ignored (which is probably broken, it always selected maximal
quality).

Inserting this filter can be done simply with --vf=pp, so this is not
needed anymore.

DOCS/man/en/changes.rst

@@ -176,6 +176,7 @@ Command Line Switches
     ``-af volnorm``             ``--af=drc`` (renamed)
     ``-zoom``                   Inverse available as ``--video-unscaled``
     ``-panscanrange``           ``--video-zoom``, ``--video-pan-x/y``
+    ``-pp``                     ``-vf=pp``
     =========================== ========================================
 
 .. note::

DOCS/man/en/options.rst

@@ -1620,9 +1620,6 @@ OPTIONS
 
         FIXME: This needs to be clarified and documented thoroughly.
 
-``--pp=<quality>``
-    See also ``--vf=pp``.
-
 ``--pphelp``
     See also ``--vf=pp``.
 

mpvcore/options.c

@@ -491,8 +491,6 @@ const m_option_t mp_opts[] = {
                 {"vaapi-copy", 5})),
     OPT_STRING("hwdec-codecs", hwdec_codecs, 0),
 
-    // postprocessing:
-    OPT_INT("pp", divx_quality, 0),
 #if HAVE_LIBPOSTPROC
     {"pphelp", (void *) &pp_help, CONF_TYPE_PRINT, CONF_GLOBAL | CONF_NOCFG, 0, 0, NULL},
 #endif

mpvcore/options.h

@@ -180,7 +180,6 @@ typedef struct MPOpts {
     float movie_aspect;
     int flip;
     int field_dominance;
-    int divx_quality;
     char **sub_name;
     char **sub_paths;
     int sub_auto;

video/decode/dec_video.c

@@ -64,19 +64,6 @@ int vd_control(struct sh_video *sh_video, int cmd, void *arg)
     return CONTROL_UNKNOWN;
 }
 
-int get_video_quality_max(sh_video_t *sh_video)
-{
-    vf_instance_t *vf = sh_video->vfilter;
-    if (vf) {
-        int ret = vf_control(vf, VFCTRL_QUERY_MAX_PP_LEVEL, NULL);
-        if (ret > 0) {
-            mp_tmsg(MSGT_DECVIDEO, MSGL_INFO, "[PP] Using external postprocessing filter, max q = %d.\n", ret);
-            return ret;
-        }
-    }
-    return 0;
-}
-
 int set_video_colors(sh_video_t *sh_video, const char *item, int value)
 {
     vf_instance_t *vf = sh_video->vfilter;
@@ -323,11 +310,6 @@ int mpcodecs_reconfig_vo(sh_video_t *sh, const struct mp_image_params *params)
     mp_msg(MSGT_DECVIDEO, MSGL_V, "VDec: vo config request - %d x %d (%s)\n",
            p.w, p.h, vo_format_name(p.imgfmt));
 
-    if (get_video_quality_max(sh) <= 0 && opts->divx_quality) {
-        // user wants postprocess but no pp filter yet:
-        sh->vfilter = vf = vf_open_filter(opts, vf, "pp", NULL);
-    }
-
     // check if libvo and codec has common outfmt (no conversion):
     int flags = 0;
     for (;;) {

video/decode/dec_video.h

@@ -33,8 +33,6 @@ struct demux_packet;
 void *decode_video(sh_video_t *sh_video, struct demux_packet *packet,
                    int drop_frame, double pts);
 
-int get_video_quality_max(sh_video_t *sh_video);
-
 int get_video_colors(sh_video_t *sh_video, const char *item, int *value);
 int set_video_colors(sh_video_t *sh_video, const char *item, int value);
 void resync_video_stream(sh_video_t *sh_video);

video/filter/vf.h

@@ -94,8 +94,6 @@ typedef struct vf_seteq {
 
 enum vf_ctrl {
     VFCTRL_SEEK_RESET = 1,   // reset on picture and PTS discontinuities
-    VFCTRL_QUERY_MAX_PP_LEVEL, // query max postprocessing level (if any)
-    VFCTRL_SET_PP_LEVEL,     // set postprocessing level
     VFCTRL_SET_EQUALIZER,    // set color options (brightness,contrast etc)
     VFCTRL_GET_EQUALIZER,    // get color options (brightness,contrast etc)
     VFCTRL_SCREENSHOT,       // Take screenshot, arg is voctrl_screenshot_args

video/filter/vf_pp.c

@@ -84,17 +84,6 @@ static int query_format(struct vf_instance *vf, unsigned int fmt){
     return 0;
 }
 
-static int control(struct vf_instance *vf, int request, void* data){
-    switch(request){
-    case VFCTRL_QUERY_MAX_PP_LEVEL:
-	return PP_QUALITY_MAX;
-    case VFCTRL_SET_PP_LEVEL:
-	vf->priv->pp= *((unsigned int*)data);
-	return CONTROL_TRUE;
-    }
-    return vf_next_control(vf,request,data);
-}
-
 static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
 {
     // pass-through if pp disabled
@@ -143,7 +132,6 @@ static int vf_open(vf_instance_t *vf, char *args){
     int i;
 
     vf->query_format=query_format;
-    vf->control=control;
     vf->config=config;
     vf->filter=filter;
     vf->uninit=uninit;