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 00AE3443A6 for ; Mon, 10 Oct 2022 10:55:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60F6268BCF7; Mon, 10 Oct 2022 13:54:58 +0300 (EEST) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6746068BCEB for ; Mon, 10 Oct 2022 13:54:49 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id i7-20020a17090a65c700b0020ad9666a86so12785301pjs.0 for ; Mon, 10 Oct 2022 03:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=7x6csXj0yzvp9/vciEAvrUbrtDHHQHkd5liO8mCUb44=; b=TJcO+Kq23xR5o50mQG3RdsKKPk1SIXHMHRyPpOPSJuCZBpdIKBx73sfZDoxMUUyNF+ LHc+E63PHNqMFzqbtniIviNh9h89SB9ubXB6x//RsEIOyxCh6Essn3xHXf9RLZDgAgtJ 2WgRY/I/7N2oX8WfGvTkRys0wJ4dI4oDAhER78Qru3yzRkZXlF1YITSty9b2wJu8eMrE YaL13HOeT9Gr78F3jgxaPDbbrqFJdyeDZsKpvtHsUyu939cdyshoPIdi+RZKjcGAouBL MDVeltRTRlQI8eAzTYWGtgxTt/jkbrllxGXFQiWH8deedkYMbEvY3+9saUuiFRpxOlL3 QOsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7x6csXj0yzvp9/vciEAvrUbrtDHHQHkd5liO8mCUb44=; b=u10UKKyB/icnMj/aPaL/1VY+2VXaix6ND3pHQlKrDIaonXcQMTrl1nR1c5UMiX9Fn7 3SECy2i5xx939bMx3ZXLwQXB1vnPwitN0tTJYgE+aNdeXU4MyJoGGUuSI5Ety7suZk6N +qufFTPkoe0Z97eHxH66YgfJLiXGcKh+46sGShn7haO5RTC5Ku0cf7+Sn+PSX+WYrT2A vPZ/lzpXgSt/V7fTcDlfcM06CUUEG/mdc3RcbVrbBS2Lr5QDIEP3JlmNz2tfsAfvvfK5 5UIZjwob0aE8GrJD1/etobOz8T3OrPOZ6uR1PLprpoJxRwh7gl25L9PbMspHFZ38wpW3 Zwfw== X-Gm-Message-State: ACrzQf2tEvEJRMXoeq7uOplBXpzyvFX+tSaEloXSpNFOjwSF6bkAFDy9 IlHT3QGLxX0XPtZ+3k8oepGakRUhVnY= X-Google-Smtp-Source: AMsMyM6ns+5RPd/Sr3Cbyt+LS+2xPtRHrImPKPaveGf452f/czvifM8ECPXKa/UUUGRtYz+XYCk8jg== X-Received: by 2002:a17:90a:b00b:b0:203:a6de:5b0f with SMTP id x11-20020a17090ab00b00b00203a6de5b0fmr19896196pjq.134.1665399287802; Mon, 10 Oct 2022 03:54:47 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id j8-20020a170902da8800b0017305e99f00sm6299772plx.107.2022.10.10.03.54.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Oct 2022 03:54:47 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <5ff8f82002ea301c00dbc54beff1063c7e26a8e2.1665399281.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 10 Oct 2022 10:54:37 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 07/11] avfilter/overlay_vaapi: add framesync options 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: softworkz 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: From: softworkz Signed-off-by: softworkz --- libavfilter/vf_overlay_vaapi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_overlay_vaapi.c b/libavfilter/vf_overlay_vaapi.c index 71fc90a86b..f4f9cc58ec 100644 --- a/libavfilter/vf_overlay_vaapi.c +++ b/libavfilter/vf_overlay_vaapi.c @@ -292,8 +292,7 @@ static int overlay_vaapi_config_output(AVFilterLink *outlink) if (err < 0) return err; - ctx->fs.on_event = overlay_vaapi_blend; - ctx->fs.opaque = ctx; + ctx->fs.on_event = overlay_vaapi_blend; ctx->fs.time_base = outlink->time_base; return ff_framesync_configure(&ctx->fs); @@ -321,6 +320,7 @@ static av_cold void overlay_vaapi_uninit(AVFilterContext *avctx) OverlayVAAPIContext *ctx = avctx->priv; ff_framesync_uninit(&ctx->fs); + ff_vaapi_vpp_ctx_uninit(avctx); } #define OFFSET(x) offsetof(OverlayVAAPIContext, x) @@ -331,10 +331,18 @@ static const AVOption overlay_vaapi_options[] = { { "w", "Overlay width", OFFSET(overlay_ow), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = FLAGS }, { "h", "Overlay height", OFFSET(overlay_oh), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = FLAGS }, { "alpha", "Overlay global alpha", OFFSET(alpha), AV_OPT_TYPE_FLOAT, { .dbl = 1.0 }, 0.0, 1.0, .flags = FLAGS }, + { "eof_action", "Action to take when encountering EOF from secondary input ", + OFFSET(fs.opt_eof_action), AV_OPT_TYPE_INT, { .i64 = EOF_ACTION_REPEAT }, + EOF_ACTION_REPEAT, EOF_ACTION_PASS, .flags = FLAGS, "eof_action" }, + { "repeat", "Repeat the previous frame.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_REPEAT }, .flags = FLAGS, "eof_action" }, + { "endall", "End both streams.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_ENDALL }, .flags = FLAGS, "eof_action" }, + { "pass", "Pass through the main input.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_PASS }, .flags = FLAGS, "eof_action" }, + { "shortest", "force termination when the shortest input terminates", OFFSET(fs.opt_shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, + { "repeatlast", "repeat overlay of the last overlay frame", OFFSET(fs.opt_repeatlast), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, { NULL }, }; -AVFILTER_DEFINE_CLASS(overlay_vaapi); +FRAMESYNC_DEFINE_CLASS(overlay_vaapi, OverlayVAAPIContext, fs); static const AVFilterPad overlay_vaapi_inputs[] = { { @@ -364,6 +372,7 @@ const AVFilter ff_vf_overlay_vaapi = { .init = &overlay_vaapi_init, .uninit = &overlay_vaapi_uninit, .activate = &overlay_vaapi_activate, + .preinit = overlay_vaapi_framesync_preinit, FILTER_INPUTS(overlay_vaapi_inputs), FILTER_OUTPUTS(overlay_vaapi_outputs), FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VAAPI), -- ffmpeg-codebot _______________________________________________ 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".