From patchwork Mon May 22 10:14:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 41778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1599994pzb; Mon, 22 May 2023 03:14:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5o3HlK8/oxv8Yahmx6N+1kICoXJOWRQ3L/sfcirpJz3ItxfZtGnNB/+icEKUka23bYvH6j X-Received: by 2002:a17:907:1c82:b0:96a:f6f6:4efd with SMTP id nb2-20020a1709071c8200b0096af6f64efdmr10535159ejc.49.1684750491667; Mon, 22 May 2023 03:14:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684750491; cv=none; d=google.com; s=arc-20160816; b=NEIiaNDp8yDm+Hk2ILu1J1PAi9iV99OdKSnAUQWONn+RxeQMxPTjnWLukyYtjBYJub lHLMOgBX4i0ZQq0wvr6wMLuVlEkEr8hwwXhYMw93JL0mvSFINZF06vzm/cFzpbQZlrQ1 g3oLrPzWeIgpA/oCEBzPsQzQfY5dUEcaItJgI8Wswbl3KoSO2gaDeJ5bn/aTul036YsO 0gPVkgdZVS0Eyf6nxUnwoxgdnWN7D+C2Wr9xiN9/YFkccCm4MxPq66PieF3V24wk1KS6 7JUSzzxGokhCgrHMAVYtUFAU7nTJxUdgeUXoXBGMNWI3svq2RiaRFBxDZj1GQwHL47Tj +7lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=kr7f1TPIgei7ULUglSUQoHhxhBE63I7s5DWzzmzpwlQ=; b=wrO1eVe4SKlswfog98gF4ckp7qrIXbTTQc+b7Vs7usO+nS4dsu/3Mkal1vM3lDYvfc UvZYk66Oe8Jt5TOcBLQ/T/3qNWYSczdawMuc1vqOtD3/UkLibAhc4b06lHSeXT+78XRW 6pdfXQGTuRoaon93l4NOYrFO74cgxOk0sSp8VFjstoBfmqC7OegVkAM+FUzSLLm/boVS /D5DRFwmi6sdyVk5dtwMA436IJkQl5bpjdz0uEsblm/gnC2nEAWMYilgbTseUtmMAZzp 9yepKevQsnHJFzDhfosXO0xAyraO0+U+juiV4SP+r5IE4nK8LO10X5/PtE3Qi+tBO6vZ GFiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Y+nhn80A; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a26-20020a17090640da00b00965cb784a27si3751340ejk.699.2023.05.22.03.14.51; Mon, 22 May 2023 03:14:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Y+nhn80A; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E104868C006; Mon, 22 May 2023 13:14:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F93F68B681 for ; Mon, 22 May 2023 13:14:41 +0300 (EEST) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-510d6e1f1b2so10252911a12.3 for ; Mon, 22 May 2023 03:14:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684750480; x=1687342480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7YwcQIbI8g5xl1S4Dbkm5qEdOLogZMzO/mf5lu22sCM=; b=Y+nhn80AMcTvwDB3OUk9zwOJ5aDCwfzk1j4ckqJKsY8QodQ6awwiZgAzF0vi0jkOPm bghCOqhSxsLwdXVi9RAsWscmbR7Tfqeeozdu8pVbJ9+XQeGQ7T/5sqSeOGnjOgOyfC13 hENiq2HtnSy4dddxHx739NIbl+hYrfLh8C53pZAwE5mSySnOC2z9cvnAX4xvfD+ONzGV P+IcpI2WVN6N6xwqIm4cNdSHKM6BQGgjzas+0dHXLClQ/AMFGxkZQwZ8k/l+vfTf/vLu nNjB2h1fJe3ziprVSQfgCBvKq3icBUOKQb4rEXmIffDY1CVSIhTiD39DUP64RiDpmLnd JshA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684750480; x=1687342480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7YwcQIbI8g5xl1S4Dbkm5qEdOLogZMzO/mf5lu22sCM=; b=LXtGs4HpwshjjwP0Q/juck0WYD3QXtt9bEAfSYTu/px4iYjk8P7fHO84jXIrzJ5X6q QvsYtsDEDXFKLOXf9ZXmAa5weUyNWGMUjmhXaJgp+xjho4VtZN1zuskIyJIPOl8n+wz7 9ddm4ipgJqHs0vWjVaQhtGku3YED3PzDrwV9rKLzBkRrIy6yzjQ0BplxZng3kBvVSai6 AYbi/iUt9kMLSZpEdbgLI0pOyVJAkWFauNIQXeVrg3oFjVPbmswlptXFEykZciq8VvBs pNdVgETJENOEhTQMbm6lQXY7mBGtiePQkvuyU4Vpnk9Hab8+JBDFx3W4M2aeerlobzd1 qVwQ== X-Gm-Message-State: AC+VfDx9vMygv6MJXBSLPfG+T2ugjdNF7TWjjhfCvuEY+cWyAtAnrGJR ilGf9NTmy9xl6ejmWqSWgsOzrLtmBUM= X-Received: by 2002:aa7:de06:0:b0:50b:d53d:7ceb with SMTP id h6-20020aa7de06000000b0050bd53d7cebmr6064384edv.40.1684750480357; Mon, 22 May 2023 03:14:40 -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 ba7-20020a0564021ac700b0050daa883545sm2860199edb.64.2023.05.22.03.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 03:14:39 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 May 2023 12:14:32 +0200 Message-Id: <20230522101433.40493-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230419104250.21354-1-epirat07@gmail.com> References: <20230419104250.21354-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: z9Pu9BLUwR7D --- 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);