diff options
author | Stefano Sabatini <stefasab@gmail.com> | 2012-09-30 13:46:01 +0200 |
---|---|---|
committer | Stefano Sabatini <stefasab@gmail.com> | 2012-10-02 09:43:06 +0200 |
commit | c053f486625419494856486c2866d550023f828c (patch) | |
tree | b9747d721ccf1ceb762bcc208ad89adbb9629a16 /libavfilter/vf_transpose.c | |
parent | 630006277448bfa023a4de2c5f56cbd24f027052 (diff) | |
download | ffmpeg-c053f486625419494856486c2866d550023f828c.tar.gz |
lavfi/transpose: add passthrough option
Diffstat (limited to 'libavfilter/vf_transpose.c')
-rw-r--r-- | libavfilter/vf_transpose.c | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 41ca0629aa..2671c584b0 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -37,6 +37,12 @@ #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; @@ -47,7 +53,7 @@ typedef struct { /* 2 Rotate by 90 degrees counterclockwise. */ /* 3 Rotate by 90 degrees clockwise and vflip. */ int dir; - int passthrough; ///< landscape passthrough mode enabled + PassthroughType passthrough; ///< landscape passthrough mode enabled } TransContext; #define OFFSET(x) offsetof(TransContext, x) @@ -55,6 +61,13 @@ typedef struct { 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 }, }; @@ -63,7 +76,7 @@ AVFILTER_DEFINE_CLASS(transpose); static av_cold int init(AVFilterContext *ctx, const char *args) { TransContext *trans = ctx->priv; - const char *shorthand[] = { "dir", NULL }; + const char *shorthand[] = { "dir", "passthrough", NULL }; trans->class = &transpose_class; av_opt_set_defaults(trans); @@ -106,15 +119,20 @@ static int config_props_output(AVFilterLink *outlink) const AVPixFmtDescriptor *pixdesc = &av_pix_fmt_descriptors[outlink->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; - if (inlink->w >= inlink->h) { - trans->passthrough = 1; + trans->passthrough = TRANSPOSE_PT_TYPE_LANDSCAPE; + } - av_log(ctx, AV_LOG_VERBOSE, - "w:%d h:%d -> w:%d h:%d (landscape passthrough mode)\n", - inlink->w, inlink->h, outlink->w, outlink->h); - return 0; - } + 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 = av_pix_fmt_descriptors[inlink->format].log2_chroma_w; |