generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/transpose: add passthrough option

Browse Source
This commit is contained in:
Stefano Sabatini 2012-09-30 13:46:01 +02:00
parent 6300062774
commit c053f48662
3 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/filters.texi
View File

@ -3559,8 +3559,23 @@ l.r l.L
@end example
@end table
For values between 4-7 transposition is only done if the input video
geometry is portrait and not landscape.
For values between 4-7, the transposition is only done if the input
video geometry is portrait and not landscape. These values are
deprecated, the @code{passthrough} option should be used instead.
@item passthrough
Do not apply the transposition if the input geometry matches the one
specified by the specified value. It accepts the following values:
@table @samp
@item none
Always apply transposition.
@item portrait
Preserve portrait geometry (when @var{height} >= @var{width}).
@item landscape
Preserve landscape geometry (when @var{width} >= @var{height}).
@end table
Default value is @code{none}.
@end table
@section unsharp

2
libavfilter/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 19
#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_MICRO 102
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \

36
libavfilter/vf_transpose.c
View File

@ -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;