Skip to content

Commit

Permalink
video: fix rotation and deinterlace auto filters
Browse files Browse the repository at this point in the history
Now using libavfilter filters directly.

The rotation case is a bit lazy, because it uses the slow vf_rotate
filter in all cases, instead of using special filters for 90° step
rotations.
  • Loading branch information
wm4 committed Nov 29, 2017
1 parent 9d6bc77 commit 03518c1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 1 addition & 3 deletions Copyright
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ them quite central:
correction, fine control about downmix/upmix/resampling behavior
- Linux X11 video output
- BSD audio output via OSS
- NVIDIA/Linux hardware decoding (vdpau, although CUDA usually works)
- many builtin video filters (use libavfilter instead)
- automatic rotation and stereoscopic video handling
- NVIDIA/Linux hardware decoding (vdpau, although nvdec usually works)
- Linux TV input
- minor features: jack, DVD, CDDA, SMB, CACA, legacy direct3d VO
Some of these will be fixed in the future. The intended use for LGPL mode is
Expand Down
8 changes: 6 additions & 2 deletions player/video.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static int probe_deint_filters(struct vo_chain *vo_c)
if (check_output_format(vo_c, IMGFMT_D3D11VA) ||
check_output_format(vo_c, IMGFMT_D3D11NV12))
return try_filter(vo_c, "d3d11vpp", VF_DEINTERLACE_LABEL, NULL);
char *args[] = {"warn", "no", NULL};
char *args[] = {"mode", "send_field", "deint", "interlaced", NULL};
return try_filter(vo_c, "yadif", VF_DEINTERLACE_LABEL, args);
}

Expand Down Expand Up @@ -144,7 +144,11 @@ static void filter_reconfig(struct MPContext *mpctx, struct vo_chain *vo_c)
if (params.rotate) {
if (!(vo_c->vo->driver->caps & VO_CAP_ROTATE90) || params.rotate % 90) {
// Try to insert a rotation filter.
char *args[] = {"angle", "auto", "warn", "no", NULL};
double angle = params.rotate / 360.0 * M_PI * 2;
char *args[] = {"angle", mp_tprintf(30, "%f", angle),
"ow", mp_tprintf(30, "rotw(%f)", angle),
"oh", mp_tprintf(30, "roth(%f)", angle),
NULL};
if (try_filter(vo_c, "rotate", "autorotate", args) < 0)
MP_ERR(vo_c, "Can't insert rotation filter.\n");
}
Expand Down

0 comments on commit 03518c1

Please sign in to comment.