From: Limin Wang <lance.lmw...@gmail.com>
Signed-off-by: Limin Wang <lance.lmw...@gmail.com>
---
doc/filters.texi | 6 ++--
libavfilter/vf_cover_rect.c | 56 +++++++++++++++++++++++++++----------
2 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index ec1c7c7591..4594a61c13 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -10166,7 +10166,7 @@ Specifies the rectangle in which to search.
@itemize
@item
-Generate a representative palette of a given video using @command{ffmpeg}:
+Cover a rectangular object by the supplied image of a given video using
@command{ffmpeg}:
@example
ffmpeg -i file.ts -vf find_rect=newref.pgm,cover_rect=cover.jpg:mode=cover
new.mkv
@end example
@@ -10180,7 +10180,7 @@ It accepts the following options:
@table @option
@item cover
-Filepath of the optional cover image, needs to be in yuv420.
+Filepath of the optional cover image.
@item mode
Set covering mode.
@@ -10200,7 +10200,7 @@ Default value is @var{blur}.
@itemize
@item
-Generate a representative palette of a given video using @command{ffmpeg}:
+Cover a rectangular object by the supplied image of a given video using
@command{ffmpeg}:
@example
ffmpeg -i file.ts -vf find_rect=newref.pgm,cover_rect=cover.jpg:mode=cover
new.mkv
@end example
diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c
index 898debf09d..36c650dd21 100644
--- a/libavfilter/vf_cover_rect.c
+++ b/libavfilter/vf_cover_rect.c
@@ -28,6 +28,7 @@
#include "internal.h"
#include "lavfutils.h"
+#include "lswsutils.h"
enum mode {
MODE_COVER,
@@ -40,6 +41,7 @@ typedef struct CoverContext {
int mode;
char *cover_filename;
AVFrame *cover_frame;
+ AVFrame *match_frame;
int width, height;
} CoverContext;
@@ -71,21 +73,21 @@ static int config_input(AVFilterLink *inlink)
return 0;
}
-static void cover_rect(CoverContext *cover, AVFrame *in, int offx, int offy)
+static void cover_rect(AVFrame *cover_frame, AVFrame *in, int offx, int offy)
{
int x, y, p;
for (p = 0; p < 3; p++) {
uint8_t *data = in->data[p] + (offx>>!!p) + (offy>>!!p) *
in->linesize[p];
- const uint8_t *src = cover->cover_frame->data[p];
- int w = AV_CEIL_RSHIFT(cover->cover_frame->width , !!p);
- int h = AV_CEIL_RSHIFT(cover->cover_frame->height, !!p);
+ const uint8_t *src = cover_frame->data[p];
+ int w = AV_CEIL_RSHIFT(cover_frame->width , !!p);
+ int h = AV_CEIL_RSHIFT(cover_frame->height, !!p);
for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) {
data[x] = src[x];
}
data += in->linesize[p];
- src += cover->cover_frame->linesize[p];
+ src += cover_frame->linesize[p];
}
}
}
@@ -138,7 +140,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
CoverContext *cover = ctx->priv;
AVDictionaryEntry *ex, *ey, *ew, *eh;
int x = -1, y = -1, w = -1, h = -1;
+ enum AVPixelFormat in_format;
char *xendptr = NULL, *yendptr = NULL, *wendptr = NULL, *hendptr = NULL;
+ AVFrame *cover_frame = NULL;
+ int ret;
ex = av_dict_get(in->metadata, "lavfi.rect.x", NULL, AV_DICT_MATCH_CASE);
ey = av_dict_get(in->metadata, "lavfi.rect.y", NULL, AV_DICT_MATCH_CASE);
@@ -167,14 +172,34 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
}
w = FFMIN(w, in->width - x);
h = FFMIN(h, in->height - y);
+ in_format = in->format;
if (w > in->width || h > in->height || w <= 0 || h <= 0)
return AVERROR(EINVAL);
- if (cover->cover_frame) {
- if (w != cover->cover_frame->width || h != cover->cover_frame->height)
- return AVERROR(EINVAL);
- }
+ if (w != cover->cover_frame->width || h != cover->cover_frame->height ||
+ in_format != cover->cover_frame->format) {
+ if (!cover->match_frame || (w != cover->match_frame->width || h !=
cover->match_frame->height
+ || in_format != cover->match_frame->format)) {
+ if (cover->match_frame)
+ av_freep(&cover->match_frame->data[0]);
+ else if (!(cover->match_frame = av_frame_alloc()))
+ return AVERROR(ENOMEM);
+
+ if ((ret = ff_scale_image(cover->match_frame->data,
cover->match_frame->linesize,
+ w, h, in_format, cover->cover_frame->data,
cover->cover_frame->linesize,
+ cover->cover_frame->width,
cover->cover_frame->height,
+ cover->cover_frame->format, ctx)) < 0)
+ return AVERROR(ENOMEM);
+
+ cover->match_frame->width = w;
+ cover->match_frame->height = h;
+ cover->match_frame->format = in_format;
+ }
+
+ cover_frame = cover->match_frame;
+ } else
+ cover_frame = cover->cover_frame;
cover->width = w;
cover->height = h;
@@ -187,8 +212,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (cover->mode == MODE_BLUR) {
blur (cover, in, x, y);
} else {
- cover_rect(cover, in, x, y);
+ cover_rect(cover_frame, in, x, y);
+
}
+
return ff_filter_frame(ctx->outputs[0], in);
}
@@ -199,6 +226,10 @@ static av_cold void uninit(AVFilterContext *ctx)
if (cover->cover_frame)
av_freep(&cover->cover_frame->data[0]);
av_frame_free(&cover->cover_frame);
+
+ if (cover->match_frame)
+ av_freep(&cover->match_frame->data[0]);
+ av_frame_free(&cover->match_frame);
}
static av_cold int init(AVFilterContext *ctx)
@@ -220,11 +251,6 @@ static av_cold int init(AVFilterContext *ctx)
&cover->cover_frame->width,
&cover->cover_frame->height,
&cover->cover_frame->format,
cover->cover_filename, ctx)) < 0)
return ret;
-
- if (cover->cover_frame->format != AV_PIX_FMT_YUV420P &&
cover->cover_frame->format != AV_PIX_FMT_YUVJ420P) {
- av_log(ctx, AV_LOG_ERROR, "cover image is not a YUV420 image\n");
- return AVERROR(EINVAL);
- }
}
return 0;
--
2.21.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
