From patchwork Sun Jun 26 23:41:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36479 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1696065pzh; Sun, 26 Jun 2022 16:42:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uSEMmLsPnA69rMWWF8X2SRHt4KEO2Rb6+oKzQaPnoeTokWa5le8jWTAk1Jq2RBgTHS9Vqd X-Received: by 2002:a17:907:60d4:b0:722:e603:cb40 with SMTP id hv20-20020a17090760d400b00722e603cb40mr10600796ejc.272.1656286950743; Sun, 26 Jun 2022 16:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656286950; cv=none; d=google.com; s=arc-20160816; b=psB/+l7cCLJwSRMZioLTQAZzi5wwdqc7TxPdSR/T/fQPBkEXR1lzBfdHZ0JAxcJFX5 BEMakl+zMwPyDkjhq8WOb2hSgw1ADmBj2b8EVqifn/V9QYKEoYLgjjB7oAsbnUxSH/0j uA3pj0oAArBFdIPn01vwvPMdf0RLOrA0y/T6K4kRKlB+306VtKkM7Thrqw/DbVHLMxbG 99JNokRaHzqabClNDAW/E0fNhVFUbkVuvz3zfHh/XQ1ldL69HpgwjcXhohgdyG+x1qxx +Vyz9LyUqXsKm74ToHtDHWT0eKx8/hn+ubYBgzWmPn1JZOUwPgsDJIIdVG+Ug3KXeYuM hZnQ== 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:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=8YW+9azwue3ZKcaWIJN3kh2U6xbrBMbjWFMO5cgVeug=; b=nK9RqwITdLJ74JXTuken+ERR/jCFqTD9ntjcn3C4e413wJACFhJ8rcz/z+KYNGU06r EOQkhZh6fvWNkh+44Z1r6wOktZydEREfSJOEsyhS6xFfdHx5zhEtwIPw/CL/g4SgfmTr vF9cKfGs7mNcDnVvnIHtkfz4IzUgkTq/J4UWJgShqm6YWV3MnrWyJw0vrSoueil/2T73 wKJ8qlrTXGjpJdtm820L1+rbwDXq9iNVz20CG/Mya0oJLSFG9s2nbqwOLH+D6JpmZ42C Z/WkK8oXnVbZxR9+sQxEjN08AiFAn2dI2yeZD2OINoy1GYEgAQ/fwCjmZoyR8x9aa1qI QtCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oL2WaU7I; 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 z4-20020a50cd04000000b00435de3b7fc1si10889600edi.604.2022.06.26.16.42.30; Sun, 26 Jun 2022 16:42:30 -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=20210112 header.b=oL2WaU7I; 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 4924068B892; Mon, 27 Jun 2022 02:41:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69E2168B80E for ; Mon, 27 Jun 2022 02:41:33 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id o18so6711074plg.2; Sun, 26 Jun 2022 16:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=9KZTrJTRMHUr48e/zhnkR7L99y96lcu+jQEQiX6aAYE=; b=oL2WaU7IwHrzO5HKm0c7ht6lQ93c7Y2YKluT70ZgC3paq0RDEDSDHuMcmLEmrafjEl R0Xs0/wmUKF86z4hAwM/ylxHWzsA8Lj84A2BFYoM9VMAcf46WLzMqCZ1z4aO1d4kVxBx Kg9v6IehKQyTNmk8JQO9jWEL4Xt/T8zAH3eMd7nFhX7uOefDCQcOFTFgkJJ6dkO2/PUv OSRLrdLi2BkmAUqRfCFaig81wyf7U9DzqQLkXpro8perZ5HmGc0aaTf7tawCsYXR3AJ3 pZ/GVLEQN3bIlXp3bwZTYZHt3VdYIRSef8x8ojzOoVt8I0kLV6vOxSlBqCXloqAW3axu /RNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=9KZTrJTRMHUr48e/zhnkR7L99y96lcu+jQEQiX6aAYE=; b=2UyLML1CzUFs2KOY0PpFMM3JjqY2DP21FncNuwGVcjEHKKF82xMB1ef8D9DZpesILj T+oSePaPfclzSo5FXqPvfC7Mggw5hCeMWtxiooz7xdLhPQXmWu9ymJFkaQ4UmMSvZYEE aNaiQTBYEvxL0KSpLgUX6cqjmy4bPjQp60ffnzQfFiTjrXx53RDNIlQfFZjoJd4VkX7M B+zQ7gRKQtz00NdaGhvkh3BW43WWRhgDCVp2Wg7anRzh8vtZfqZ3D4smszSXKPY2fm+M nu8tMralUVlhy5f+x3XFXy5lJOKaLDG8dGtJVOBsvzJqlpdRQNrTD3kt5AXTY3WfwJpB YlTA== X-Gm-Message-State: AJIora/tEgf5173fIoRi9jVs5ehmH3TuOjs5zTy4qd4e4DHAOli5ZF+w O5mFoGIGkJ1a4MKxKIQgqfLMcuJWN1FovA== X-Received: by 2002:a17:902:6901:b0:168:9bb4:7adb with SMTP id j1-20020a170902690100b001689bb47adbmr11755676plk.147.1656286891626; Sun, 26 Jun 2022 16:41:31 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id q5-20020a170902bd8500b001640beeebf1sm5649740pls.268.2022.06.26.16.41.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jun 2022 16:41:31 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <06976606c5d31f43c3c5410aa6f92f797d859f7c.1656286888.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sun, 26 Jun 2022 23:41:24 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v4 2/6] avcodec/vpp_qsv: Copy side data from input to output frame 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: Kieran Kunhya , softworkz , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MCMxrsuBAbmQ From: softworkz Signed-off-by: softworkz --- libavfilter/qsvvpp.c | 6 ++++++ libavfilter/vf_overlay_qsv.c | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 954f882637..f4bf628073 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -843,6 +843,12 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr return AVERROR(EAGAIN); break; } + + av_frame_remove_all_side_data(out_frame->frame); + ret = av_frame_copy_side_data(out_frame->frame, in_frame->frame, 0); + if (ret < 0) + return ret; + out_frame->frame->pts = av_rescale_q(out_frame->surface.Data.TimeStamp, default_tb, outlink->time_base); diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c index 7e76b39aa9..e15214dbf2 100644 --- a/libavfilter/vf_overlay_qsv.c +++ b/libavfilter/vf_overlay_qsv.c @@ -231,13 +231,24 @@ static int process_frame(FFFrameSync *fs) { AVFilterContext *ctx = fs->parent; QSVOverlayContext *s = fs->opaque; + AVFrame *frame0 = NULL; AVFrame *frame = NULL; - int ret = 0, i; + int ret = 0; - for (i = 0; i < ctx->nb_inputs; i++) { + for (unsigned i = 0; i < ctx->nb_inputs; i++) { ret = ff_framesync_get_frame(fs, i, &frame, 0); - if (ret == 0) - ret = ff_qsvvpp_filter_frame(s->qsv, ctx->inputs[i], frame); + + if (ret == 0) { + if (i == 0) + frame0 = frame; + else { + av_frame_remove_all_side_data(frame); + ret = av_frame_copy_side_data(frame, frame0, 0); + } + + ret = ret < 0 ? ret : ff_qsvvpp_filter_frame(s->qsv, ctx->inputs[i], frame); + } + if (ret < 0 && ret != AVERROR(EAGAIN)) break; }