From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id F295B452A7 for ; Wed, 19 Apr 2023 10:43:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F26C468BF13; Wed, 19 Apr 2023 13:43:06 +0300 (EEST) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D47AC68BE98 for ; Wed, 19 Apr 2023 13:43:00 +0300 (EEST) Received: by mail-ej1-f51.google.com with SMTP id ud9so80202221ejc.7 for ; Wed, 19 Apr 2023 03:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681900980; x=1684492980; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UQ++EChj7fdA51UV6d6VarfsRm5uX/HWjCISym+j6rg=; b=FCPX9nqCwmX5w9MrBJ1Un/+fi48rhftGXcV9PgSCLC3CEG5iF6H+5HLoIyKjSVxI2i skBmM98QFZxEZDvvCvQCzWbtpBefaKM84gmJmaB6Avw0xhFlxcMTPVCbpcrJxnn7vETK AJQkEr1DGLnEUNy7kPIEHyLS6tKaNCSUEhjF7EiMZxnGxBo1IDUpA0vuwzewh1cD6IIw tdhD8JedV0CL+17TCOJHix6+rCANLSKbGls7n0h0m8peOWy5Yo08/1YOTAiY931s7X0U +H/GFnJclhRkSrW7PQgDcEF38lqvl7tmqo3a/k9RBxqlCXI+maQrRGjJzvnOwOP51Z2x g1EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681900980; x=1684492980; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UQ++EChj7fdA51UV6d6VarfsRm5uX/HWjCISym+j6rg=; b=hGd+jBE3h+1ghibV98EiVbIwBMTWcVR+H3KO+m7uWuxbhJeWARDmlRQdS2V6JVPHuA BjKM5jahPpEPriMmE622cbl7Ww72GLFFRnbsZ41v33OqTatjxugTfbPDWGm6sIFJlZH8 u2JDIV6g8sy+IUBrECj6bTWu7lVgzhfrEKe7SQMinNZVenXPV2zLaKkF/4n79Lealqbw Hg/E2VLqNUEnaQa86pZH43u1Na6FkMLhrqSEfRfOEnF6OziQ80ffmb6fGgNlRW+h0Gd7 ev4W2qNmAfsY0QwvYhoS+1H7TV31oOfVSBBIgO+8xeyct564KWDOdZqwNNSd9YGzi4GC 4okg== X-Gm-Message-State: AAQBX9dOKaHC0PDJawZPwr2vNNcna96DnS0PBJzzKwNePiStacbhpWy7 ffZFs6+A53mTBtJfNhw4uk5a59eKY3k= X-Google-Smtp-Source: AKy350ZjgovlD9Be04L8LbTvX3rYS5UYsc8ClFxUwWJS4V30oabK0b8Ayu1KC5Uu6XdTiiSdbpFmEA== X-Received: by 2002:a17:906:4c86:b0:953:47fc:3f0b with SMTP id q6-20020a1709064c8600b0095347fc3f0bmr2599207eju.53.1681900979840; Wed, 19 Apr 2023 03:42:59 -0700 (PDT) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id m5-20020aa7c2c5000000b00506987c5c71sm4792859edp.70.2023.04.19.03.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 03:42:59 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Apr 2023 12:42:49 +0200 Message-Id: <20230419104250.21354-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_tpad: use enum for start/stop_mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marvin Scholz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- 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..88c3c99de4 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=0}, 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); -- 2.37.0 (Apple Git-136) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".