diff options
Diffstat (limited to 'libavfilter/vf_transpose.c')
-rw-r--r-- | libavfilter/vf_transpose.c | 97 |
1 files changed, 73 insertions, 24 deletions
diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index d7a1739..c381ecc 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -2,20 +2,20 @@ * Copyright (c) 2010 Stefano Sabatini * Copyright (c) 2008 Vitor Sessak * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -28,6 +28,7 @@ #include <stdio.h> #include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" @@ -36,7 +37,14 @@ #include "internal.h" #include "video.h" +typedef enum { + TRANSPOSE_PT_TYPE_NONE, + TRANSPOSE_PT_TYPE_LANDSCAPE, + TRANSPOSE_PT_TYPE_PORTRAIT, +} PassthroughType; + typedef struct { + const AVClass *class; int hsub, vsub; int pixsteps[4]; @@ -45,27 +53,40 @@ typedef struct { /* 2 Rotate by 90 degrees counterclockwise. */ /* 3 Rotate by 90 degrees clockwise and vflip. */ int dir; + PassthroughType passthrough; ///< landscape passthrough mode enabled } TransContext; +#define OFFSET(x) offsetof(TransContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption transpose_options[] = { + { "dir", "set transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, {.i64=0}, 0, 7, FLAGS }, + + { "passthrough", "do not apply transposition if the input matches the specified geometry", + OFFSET(passthrough), AV_OPT_TYPE_INT, {.i64=TRANSPOSE_PT_TYPE_NONE}, 0, INT_MAX, FLAGS, "passthrough" }, + { "none", "always apply transposition", 0, AV_OPT_TYPE_CONST, {.i64=TRANSPOSE_PT_TYPE_NONE}, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { "portrait", "preserve portrait geometry", 0, AV_OPT_TYPE_CONST, {.i64=TRANSPOSE_PT_TYPE_PORTRAIT}, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { "landscape", "preserve landscape geometry", 0, AV_OPT_TYPE_CONST, {.i64=TRANSPOSE_PT_TYPE_LANDSCAPE}, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + + { NULL }, +}; + +AVFILTER_DEFINE_CLASS(transpose); + static av_cold int init(AVFilterContext *ctx, const char *args) { TransContext *trans = ctx->priv; - trans->dir = 0; + const char *shorthand[] = { "dir", "passthrough", NULL }; - if (args) - sscanf(args, "%d", &trans->dir); + trans->class = &transpose_class; + av_opt_set_defaults(trans); - if (trans->dir < 0 || trans->dir > 3) { - av_log(ctx, AV_LOG_ERROR, "Invalid value %d not between 0 and 3.\n", - trans->dir); - return AVERROR(EINVAL); - } - return 0; + return av_opt_set_from_string(trans, args, shorthand, "=", ":"); } static int query_formats(AVFilterContext *ctx) { - enum AVPixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, @@ -75,16 +96,13 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_BGR555BE, AV_PIX_FMT_BGR555LE, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_GRAY16LE, AV_PIX_FMT_YUV420P16LE, AV_PIX_FMT_YUV420P16BE, - AV_PIX_FMT_YUV422P16LE, AV_PIX_FMT_YUV422P16BE, AV_PIX_FMT_YUV444P16LE, AV_PIX_FMT_YUV444P16BE, AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, AV_PIX_FMT_RGB8, AV_PIX_FMT_BGR8, AV_PIX_FMT_RGB4_BYTE, AV_PIX_FMT_BGR4_BYTE, - AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, - AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, - AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, - AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ440P, + AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; @@ -101,6 +119,23 @@ static int config_props_output(AVFilterLink *outlink) const AVPixFmtDescriptor *desc_out = av_pix_fmt_desc_get(outlink->format); const AVPixFmtDescriptor *desc_in = av_pix_fmt_desc_get(inlink->format); + if (trans->dir&4) { + av_log(ctx, AV_LOG_WARNING, + "dir values greater than 3 are deprecated, use the passthrough option instead\n"); + trans->dir &= 3; + trans->passthrough = TRANSPOSE_PT_TYPE_LANDSCAPE; + } + + if ((inlink->w >= inlink->h && trans->passthrough == TRANSPOSE_PT_TYPE_LANDSCAPE) || + (inlink->w <= inlink->h && trans->passthrough == TRANSPOSE_PT_TYPE_PORTRAIT)) { + av_log(ctx, AV_LOG_VERBOSE, + "w:%d h:%d -> w:%d h:%d (passthrough mode)\n", + inlink->w, inlink->h, inlink->w, inlink->h); + return 0; + } else { + trans->passthrough = TRANSPOSE_PT_TYPE_NONE; + } + trans->hsub = desc_in->log2_chroma_w; trans->vsub = desc_in->log2_chroma_h; @@ -121,13 +156,25 @@ static int config_props_output(AVFilterLink *outlink) return 0; } +static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h) +{ + TransContext *trans = inlink->dst->priv; + + return trans->passthrough ? + ff_null_get_video_buffer (inlink, perms, w, h) : + ff_default_get_video_buffer(inlink, perms, w, h); +} + static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in) { - AVFilterLink *outlink = inlink->dst->outputs[0]; TransContext *trans = inlink->dst->priv; + AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterBufferRef *out; int plane; + if (trans->passthrough) + return ff_filter_frame(outlink, in); + out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); if (!out) { avfilter_unref_bufferp(&in); @@ -136,11 +183,11 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in) out->pts = in->pts; - if (in->video->pixel_aspect.num == 0) { - out->video->pixel_aspect = in->video->pixel_aspect; + if (in->video->sample_aspect_ratio.num == 0) { + out->video->sample_aspect_ratio = in->video->sample_aspect_ratio; } else { - out->video->pixel_aspect.num = in->video->pixel_aspect.den; - out->video->pixel_aspect.den = in->video->pixel_aspect.num; + out->video->sample_aspect_ratio.num = in->video->sample_aspect_ratio.den; + out->video->sample_aspect_ratio.den = in->video->sample_aspect_ratio.num; } for (plane = 0; out->data[plane]; plane++) { @@ -202,6 +249,7 @@ static const AVFilterPad avfilter_vf_transpose_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, + .get_video_buffer= get_video_buffer, .filter_frame = filter_frame, .min_perms = AV_PERM_READ, }, @@ -228,4 +276,5 @@ AVFilter avfilter_vf_transpose = { .inputs = avfilter_vf_transpose_inputs, .outputs = avfilter_vf_transpose_outputs, + .priv_class = &transpose_class, }; |