diff options
| -rw-r--r-- | DOCS/man/en/vf.rst | 11 | ||||
| -rw-r--r-- | video/filter/vf_lavfi.c | 5 | ||||
| -rw-r--r-- | video/filter/vf_rotate.c | 110 |
3 files changed, 25 insertions, 101 deletions
diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst index b361603f60..f337a455b7 100644 --- a/DOCS/man/en/vf.rst +++ b/DOCS/man/en/vf.rst @@ -88,15 +88,8 @@ Available filters are: ``mirror`` Mirrors the image on the Y axis. -``rotate[=<0-7>]`` - Rotates the image by 90 degrees and optionally flips it. For values - between 4-7 rotation is only done if the movie geometry is portrait and - not landscape. - - :0: Rotate by 90 degrees clockwise and flip (default). - :1: Rotate by 90 degrees clockwise. - :2: Rotate by 90 degrees counterclockwise. - :3: Rotate by 90 degrees counterclockwise and flip. +``rotate[=0|90|180|270]`` + Rotates the image by a multiple of 90 degrees clock-wise. ``scale[=w:h[:interlaced[:chr-drop[:param[:param2[:noup[:arnd]]]]]]]`` Scales the image with the software scaler (slow) and performs a YUV<->RGB diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index abcaa79c2c..b100763e05 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -450,7 +450,7 @@ int vf_lw_set_graph(struct vf_instance *vf, struct vf_lw_opts *lavfi_opts, { if (!lavfi_opts) lavfi_opts = (struct vf_lw_opts *)vf_lw_conf.defaults; - if (!lavfi_opts->enable || !have_filter(filter)) + if (!lavfi_opts->enable || (filter && !have_filter(filter))) return -1; MP_VERBOSE(vf, "Using libavfilter for '%s'\n", vf->info->name); void *old_priv = vf->priv; @@ -462,7 +462,8 @@ int vf_lw_set_graph(struct vf_instance *vf, struct vf_lw_opts *lavfi_opts, va_list ap; va_start(ap, opts); char *s = talloc_vasprintf(vf, opts, ap); - p->cfg_graph = talloc_asprintf(vf, "%s=%s", filter, s); + p->cfg_graph = filter ? talloc_asprintf(vf, "%s=%s", filter, s) + : talloc_strdup(vf, s); talloc_free(s); va_end(ap); p->old_priv = old_priv; diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c index f2d06830bd..ad691a544e 100644 --- a/video/filter/vf_rotate.c +++ b/video/filter/vf_rotate.c @@ -21,107 +21,32 @@ #include <string.h> #include <inttypes.h> -#include "config.h" #include "common/msg.h" #include "options/m_option.h" -#include "video/img_format.h" -#include "video/mp_image.h" #include "vf.h" +#include "vf_lavfi.h" struct vf_priv_s { - int direction; + int angle; + struct vf_lw_opts *lw_opts; }; -static void rotate(unsigned char* dst,unsigned char* src,int dststride,int srcstride,int w,int h,int bpp,int dir){ - int y; - if(dir&1){ - src+=srcstride*(w-1); - srcstride*=-1; - } - if(dir&2){ - dst+=dststride*(h-1); - dststride*=-1; - } - - for(y=0;y<h;y++){ - int x; - switch(bpp){ - case 1: - for(x=0;x<w;x++) dst[x]=src[y+x*srcstride]; - break; - case 2: - for(x=0;x<w;x++) *((short*)(dst+x*2))=*((short*)(src+y*2+x*srcstride)); - break; - case 4: - for(x=0;x<w;x++) *((int*)(dst+x*4))=*((int*)(src+y*4+x*srcstride)); - default: - for(x=0;x<w;x++){ - for (int b=0;b<bpp;b++) - dst[x*bpp+b]=src[b+y*bpp+x*srcstride]; - } - break; - } - dst+=dststride; - } -} - -static int reconfig(struct vf_instance *vf, struct mp_image_params *in, - struct mp_image_params *out) -{ - *out = *in; - if (vf->priv->direction & 4) { - if (in->w < in->h) - vf->priv->direction &= 3; - } - if (vf->priv->direction & 4) - return 0; - struct mp_imgfmt_desc desc = mp_imgfmt_get_desc(in->imgfmt); - int a_w = MP_ALIGN_DOWN(in->w, desc.align_x); - int a_h = MP_ALIGN_DOWN(in->h, desc.align_y); - vf_rescale_dsize(&out->d_w, &out->d_h, in->w, in->h, a_w, a_h); - out->w = a_h; - out->h = a_w; - int t = out->d_w; - out->d_w = out->d_h; - out->d_h = t; - return 0; -} - -static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi) +static int vf_open(vf_instance_t *vf) { - if (vf->priv->direction & 4) - return mpi; + struct vf_priv_s *p = vf->priv; - struct mp_image *dmpi = vf_alloc_out_image(vf); - mp_image_copy_attributes(dmpi, mpi); + static const char *rot[] = { + "null", + "transpose=clock", + "vflip,hflip", + "transpose=cclock", + }; - for (int p = 0; p < mpi->num_planes; p++) { - rotate(dmpi->planes[p],mpi->planes[p], dmpi->stride[p],mpi->stride[p], - dmpi->plane_w[p], dmpi->plane_h[p], mpi->fmt.bytes[p], - vf->priv->direction); - } - - talloc_free(mpi); - return dmpi; -} - -static int query_format(struct vf_instance *vf, unsigned int fmt) -{ - struct mp_imgfmt_desc desc = mp_imgfmt_get_desc(fmt); - if (!(desc.flags & MP_IMGFLAG_BYTE_ALIGNED)) - return 0; - if (desc.chroma_xs != desc.chroma_ys) - return 0; - if (desc.num_planes == 1 && (desc.chroma_xs || desc.chroma_ys)) - return 0; - return vf_next_query_format(vf, fmt); -} + if (vf_lw_set_graph(vf, p->lw_opts, NULL, "%s", rot[p->angle]) >= 0) + return 1; -static int vf_open(vf_instance_t *vf){ - vf->reconfig=reconfig; - vf->filter=filter; - vf->query_format=query_format; + MP_FATAL(vf, "Requires libavfilter.\n"); return 1; } @@ -132,7 +57,12 @@ const vf_info_t vf_info_rotate = { .open = vf_open, .priv_size = sizeof(struct vf_priv_s), .options = (const struct m_option[]){ - OPT_INTRANGE("direction", direction, 0, 0, 7), + OPT_CHOICE("angle", angle, 0, + ({"0", 0}, + {"90", 1}, + {"180", 2}, + {"270", 3})), + OPT_SUBSTRUCT("", lw_opts, vf_lw_conf, 0), {0} }, }; |