[FFmpeg-cvslog] avfilter/vf_tpad: use enum for start/stop_mode
Marvin Scholz
git at videolan.org
Mon May 22 19:43:14 EEST 2023
ffmpeg | branch: master | Marvin Scholz <epirat07 at gmail.com> | Mon May 22 12:14:32 2023 +0200| [fa7180b827490ce1327bf60aa85b10c3e6a7f814] | committer: Niklas Haas
avfilter/vf_tpad: use enum for start/stop_mode
Reviewed-by: Thilo Borgmann <thilo.borgmann at mail.de>
Reviewed-by: Niklas Haas <git at haasn.dev>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa7180b827490ce1327bf60aa85b10c3e6a7f814
---
libavfilter/vf_tpad.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c
index f0c065f0c3..d0fa7df8be 100644
--- a/libavfilter/vf_tpad.c
+++ b/libavfilter/vf_tpad.c
@@ -27,6 +27,12 @@
#include "formats.h"
#include "drawutils.h"
+enum PadMode {
+ MODE_ADD = 0,
+ MODE_CLONE,
+ NB_MODE
+};
+
typedef struct TPadContext {
const AVClass *class;
int pad_start;
@@ -51,10 +57,10 @@ typedef struct TPadContext {
static const AVOption tpad_options[] = {
{ "start", "set the number of frames to delay input", OFFSET(pad_start), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, VF },
{ "stop", "set the number of frames to add after input finished", OFFSET(pad_stop), AV_OPT_TYPE_INT, {.i64=0}, -1, INT_MAX, VF },
- { "start_mode", "set the mode of added frames to start", OFFSET(start_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, VF, "mode" },
- { "add", "add solid-color frames", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, VF, "mode" },
- { "clone", "clone first/last frame", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, VF, "mode" },
- { "stop_mode", "set the mode of added frames to end", OFFSET(stop_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, VF, "mode" },
+ { "start_mode", "set the mode of added frames to start", OFFSET(start_mode), AV_OPT_TYPE_INT, {.i64=MODE_ADD}, 0, NB_MODE-1, VF, "mode" },
+ { "add", "add solid-color frames", 0, AV_OPT_TYPE_CONST, {.i64=MODE_ADD}, 0, 0, VF, "mode" },
+ { "clone", "clone first/last frame", 0, AV_OPT_TYPE_CONST, {.i64=MODE_CLONE}, 0, 0, VF, "mode" },
+ { "stop_mode", "set the mode of added frames to end", OFFSET(stop_mode), AV_OPT_TYPE_INT, {.i64=MODE_ADD}, 0, NB_MODE-1, VF, "mode" },
{ "start_duration", "set the duration to delay input", OFFSET(start_duration), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX, VF },
{ "stop_duration", "set the duration to pad input", OFFSET(stop_duration), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX, VF },
{ "color", "set the color of the added frames", OFFSET(rgba_color), AV_OPT_TYPE_COLOR, {.str="black"}, 0, 0, VF },
@@ -91,7 +97,7 @@ static int activate(AVFilterContext *ctx)
}
}
- if (s->start_mode == 0 && s->pad_start > 0 && ff_outlink_frame_wanted(outlink)) {
+ if (s->start_mode == MODE_ADD && s->pad_start > 0 && ff_outlink_frame_wanted(outlink)) {
frame = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!frame)
return AVERROR(ENOMEM);
@@ -106,7 +112,7 @@ static int activate(AVFilterContext *ctx)
return ff_filter_frame(outlink, frame);
}
- if (s->start_mode == 1 && s->pad_start > 0) {
+ if (s->start_mode == MODE_CLONE && s->pad_start > 0) {
if (s->eof) {
ff_outlink_set_status(outlink, AVERROR_EOF, 0);
return 0;
@@ -133,7 +139,7 @@ static int activate(AVFilterContext *ctx)
if (ret < 0)
return ret;
if (ret > 0) {
- if (s->stop_mode == 1 && s->pad_stop != 0) {
+ if (s->stop_mode == MODE_CLONE && s->pad_stop != 0) {
av_frame_free(&s->cache_stop);
s->cache_stop = av_frame_clone(frame);
}
@@ -147,14 +153,14 @@ static int activate(AVFilterContext *ctx)
ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
return 0;
}
- if (s->stop_mode == 0) {
+ if (s->stop_mode == MODE_ADD) {
frame = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!frame)
return AVERROR(ENOMEM);
ff_fill_rectangle(&s->draw, &s->color,
frame->data, frame->linesize,
0, 0, frame->width, frame->height);
- } else if (s->stop_mode == 1) {
+ } else if (s->stop_mode == MODE_CLONE) {
if (!s->cache_stop) {
s->pad_stop = 0;
ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
More information about the ffmpeg-cvslog
mailing list