From patchwork Fri Jul 1 20:48:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36585 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1261293pzh; Fri, 1 Jul 2022 13:49:52 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tQJqapx2+jrfXhRkJsfYw3y6ONwsGkQ7SdZtOfj1HF7s/aZU9Qq+Vd11If2IVjiE3Epy7m X-Received: by 2002:a05:6402:2741:b0:434:fe8a:1f96 with SMTP id z1-20020a056402274100b00434fe8a1f96mr21849583edd.331.1656708591982; Fri, 01 Jul 2022 13:49:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656708591; cv=none; d=google.com; s=arc-20160816; b=sDYQFDmxmvuaZeafFUZJBHobkFc/58JEeIGZQfZ6s1prkFFalcsn42Wmj4p8ZkjaNQ 1xvrt7bwKbT9eXtmmNQSnafnm0dPbFknJ+YzWe2bCLKJahw3pACOw36c7Pn5J0T6YfbR I45Y39n/4VP6kYRw4vDhyW0+jfFWFNvcBZDr+iVwDUbDTTaGRQ+s9Nsn7n5US6R7jObR D3wyZ1GS8OBpLBSXeINSP8xcRSHiCVh7Q3yLj40xBHWvjCvDW8HXLV4aWue3aIJMmIKN dHDA8iXuGO9Z/nsHGwy/qa67HrYwRLjiaoW5YUk0BuODr2YcTc+RFSZhh1Tehjj2qJ8W /70Q== 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=TioCQtdrVi+NNFS5OlGCr0e8U0Zsts6vIziHhr7OyfP2rjWJCWDILltqDlRl3QThfx vVNUdLyOEcrIRQ9bq3GLs73UVkxoM0x7WWAqyxao2fLMlfbkY9wlNOr2lWhzBj78nCFF Db0Ltztd8UK8yly5rM2tQM3cp42G57anMg92G5R3X+RV1ggpTnx7o6OJZQeI8CxhTbIJ g9zBYmnrCz8ruY3zPNJArtFg5hmo5DGWpfGUmKRtnVvZ1s44R55DqFsSsCLSdRfxuuY6 e5UOna6W2ylh04TZLKvFdil9VROEx0dUkPQUuVG0kz5sZj+Oi4yVGBKBYVJKlZqI1QrU 4pWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=C+yiNBSX; 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 e10-20020a056402088a00b00428679d26b1si26660532edy.331.2022.07.01.13.49.51; Fri, 01 Jul 2022 13:49: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=20210112 header.b=C+yiNBSX; 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 D521E68B825; Fri, 1 Jul 2022 23:49:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2436E68B722 for ; Fri, 1 Jul 2022 23:49:02 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id y141so3481636pfb.7; Fri, 01 Jul 2022 13:49:02 -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=C+yiNBSXKipNgrEarYHmS6o4ciQu1EMQ5JrHQ7DFSed+dQ8kXXnShxUNrmdOknRUoq B0PzvD1dEd/jAeMkVadJ5slmgTPRx3mPEy96M8ITuNaSGtgWMYZFhL1vrwv5Ry7dDa7y UJhQd/fHz2yKxGlPRhrR3Aqg3mFPwVOu9VQooMriMDiHalXOZUpXk361OnmKBWcJ9Dhc QmCes0Qnm49ZvaH/h/o+gYQmdU8OcfVWan+lhxdN+Xlg/exHEW/fyhHp6R0jCPjUHwln gyn4QCrJfdu+RGM3WEHgpFVkRbkHSGO5edkb476CmeKcRK5Rl4uDKqOJQ36KZTiu6vXt ucpw== 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=YJ15Iqdse0mEPFHx7Way0Kb+M/rPZr8SuurFrC5nl/Q59/G6oSbkXFHxi5OPWXt2UO 4XtlP53rRsBIi40fdwPvPJgKelf2jqNl2LTpqwwqyEeRh+wIQfZGggGgtp508ArlzEMw 9yyVz9S+cZglZwLvbKZ23v5xpFIEOX1MK2Lf/7U9YG6reZVUBa2SyPN8oR2fhoao6nDb EunAbJU486vv3fxGVdRNEAuBfvMhBcHOeCQPwFzYYR8rFtNJ9RO02WXOKBxEhPrLs4Oo jlrFMSGBaI9+ciAcDZYOUrJcrYgo+Nvu/B3djQT1KvLMijIFGml5bVX0mlEG31X+WwqJ zShA== X-Gm-Message-State: AJIora8rSKi4Wi1OWkXP+vH55ZBwrC90L9FFGSFWXzPd0WqgjglPPUXQ mR/hTxSRtrc14WldzjpiBeCuXaOBi555vA== X-Received: by 2002:a63:90c7:0:b0:40d:3c0d:33f4 with SMTP id a190-20020a6390c7000000b0040d3c0d33f4mr13721990pge.334.1656708540300; Fri, 01 Jul 2022 13:49:00 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id c12-20020a621c0c000000b0050dc7628178sm16063182pfc.82.2022.07.01.13.48.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2022 13:48:59 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <06976606c5d31f43c3c5410aa6f92f797d859f7c.1656708534.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Fri, 01 Jul 2022 20:48:50 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 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" , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BMamn+ERk35/ 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; }