From patchwork Mon Oct 24 23:04: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: 38971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2473160pzb; Mon, 24 Oct 2022 16:05:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5KR2SlDDWILXhrbvwc4H5vG5VvbU2jwsCv34tr3EdWuIhi8RKMxaL0UsmiWTA/JPC2cF7Y X-Received: by 2002:a17:907:72c5:b0:798:1c8f:5bc7 with SMTP id du5-20020a17090772c500b007981c8f5bc7mr21600782ejc.119.1666652710477; Mon, 24 Oct 2022 16:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666652710; cv=none; d=google.com; s=arc-20160816; b=QOkZj0QyQ6eJy9lKAy7E7M+5Q7DM7vY6nYL2En/tn/PjI94Ne+CdIiVAC/1UbzVFc6 M5pc607JVP7UkHcFut8QdJszfURfr6QAHFEeWqN6MYQY/N2L7OQV2J04afLTkyKwqez8 sWXGa5USpgFEGNeL5LYiBV09InFLQnXNX7vaFstlBTk7IT+sk/rNioPXL4pIqLHt+hk8 qd+zr7lHVBkhBVr9PNi03ForRF3wSIAKTm04MBi3BsQOUGwaPHLPhaC+FFgrj6goICQb q1l4oog09+f1l1gbitzOMWwhq1+kRiKJlTZGHEYjE5g37x22WgxVvaMJsiO1YRAtAmvH WPwQ== 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=U6wTOl6vnKPY8SUemzJGyGAOJv6OqNKfZ/Iw4LjoT1Q=; b=xEai+IBNjwABSU8tJJDLQhS+IGmezvuT6nJPIglgVdi6yfbRioLjqPpEISnjiI9mYQ ZNxVOu8e6fXgc21oxC1k+jQwWP8x+phAXL4vyEJzt7aZQVvuz6BGWl1udZm4dlgDfgZz /tPzrbgx9Cda+AC6UD9t4gEOiKkLll98E4JUsOGrjP26GKNiMPM7Bm5fyGytni90b5A0 lNwYLmMm8NBdb3sILHCfZWgkGOcBJDeSZGFQcBCFwQp/YFYHT3PnIHT/1IApUSwQ4Soc sra9v7PNX89d3ovQhRBKzDE8KE13D7B4UmfyePjOKfNP0sCu0yPZkGYEYLIDfUSeOcYw h4jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nytUoFbE; 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 q9-20020aa7cc09000000b004615a57e292si900126edt.426.2022.10.24.16.04.57; Mon, 24 Oct 2022 16:05:10 -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=nytUoFbE; 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 94D9468BCD0; Tue, 25 Oct 2022 02:04:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F05468BCA8 for ; Tue, 25 Oct 2022 02:04:31 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id u6so9681049plq.12 for ; Mon, 24 Oct 2022 16:04:30 -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=/qB30MEolsshmBDW2s5jOeaDG9UXxU/KmxBXkvplF0Q=; b=nytUoFbExFwFZkwnoaYdCh+xjjhCNwsEIGFNZJJHgyn2cvr9sqtFXsHVhrPYk5NQc4 j/Af2Dg1AWAFv8qeQJI3emPIj2Dq+BFuU9lYcJaF1BgEhmIffrM/kvI4qItyCN5tvMmP SPgz/XJH5uuMclLcJKjVqAh89tGtBi0voTVTSqzLfZ+hCMnagin5G9mRorW3bdZmJHq5 jwGJiAIEbLt1XrQOnEKEzZJZ51l+ZIZsz2jJkqXhfzACXtwRwV4NYlc2oDeFRbuxoOS8 oENMVpZ5m1FUPNP2HHOI+MMIB8nh/ZHqtkfQCDdVJUOSGI4QwZb/xhUGLgXavqj7dgaz b4Tg== 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=/qB30MEolsshmBDW2s5jOeaDG9UXxU/KmxBXkvplF0Q=; b=SIunt4cpsYJl7Y0vN7lbbatLdCD6Eqzl64W6TkbGYOJ+6E3QxBQ8HkEY9QKBoGyWO8 Q0n/iwgp8l/FSgFXZx6ROtIRSWCVHLYCKuM5TmTPBCpesnQFO1xo8LHcuGaIEoDIx4U1 kqhbG1n7fU4s4XeTAsPFCef01D5UgBV/UCZXQeghx/px+AqBVCpSmESiyzdwo3guhHv0 JBzgX1hlR8Iu5dckewuOf679by/rD+tLp6p79XR3Yc3ODkzSiSArAe4OzQTWEQaxpPhy cu9KynzZOU5tWmGOGdMt/nNzb0MBpkhuhNn7ewEjN+N70zjAS0CTHUKnWNKwr8ZAoVkp T4RA== X-Gm-Message-State: ACrzQf2t+w7lx+jSUC621b+1oG0/RcDSMcwQcueHT+EQQoC3SavPZu0c vqOhxvJ+dszrX0qfnxCIyw5JJQS0W5w= X-Received: by 2002:a17:90b:2250:b0:20d:9587:45c4 with SMTP id hk16-20020a17090b225000b0020d958745c4mr40020750pjb.17.1666652669051; Mon, 24 Oct 2022 16:04:29 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id y14-20020a63180e000000b0046ef0114367sm209549pgl.71.2022.10.24.16.04.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Oct 2022 16:04:28 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <43eb3257afeb4d93bac31fe593e6edffb2a09e50.1666652664.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 24 Oct 2022 23:04:24 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/2] 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: D2QXrdSwn3VY 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 8428ee89ab..ae9766d12f 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -880,6 +880,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 d947a1faa1..04fd284b92 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; }