summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-23 21:30:56 +0100
committerwm4 <wm4@nowhere>2013-11-23 21:30:56 +0100
commit25855059af0778c99f7eefeae64c007ed6efe1bb (patch)
treeb96e9e01a9b2283477284cadf72fcc5c70479c25 /video
parent82605903469798f701706d8522ef8f461514ed08 (diff)
downloadmpv-25855059af0778c99f7eefeae64c007ed6efe1bb.tar.bz2
mpv-25855059af0778c99f7eefeae64c007ed6efe1bb.tar.xz
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.
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c18
-rw-r--r--video/decode/dec_video.h2
-rw-r--r--video/filter/vf.h2
-rw-r--r--video/filter/vf_pp.c12
4 files changed, 0 insertions, 34 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index f534a427de..e6f56a3d57 100644
--- a/video/decode/dec_video.c
+++ b/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 (;;) {
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index 2564f45f97..3f163bb1f7 100644
--- a/video/decode/dec_video.h
+++ b/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);
diff --git a/video/filter/vf.h b/video/filter/vf.h
index c946a31359..9b86cd117c 100644
--- a/video/filter/vf.h
+++ b/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
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index c34252a3ef..68ec22bd22 100644
--- a/video/filter/vf_pp.c
+++ b/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;