From patchwork Thu May 26 08:08:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35940 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp254240pzj; Thu, 26 May 2022 01:09:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPdNxdEeI9x7pMFBArDntNnQxV64tKmOMWwJUwn5CVPfv7tyebWDUde+TMX/zie50/qV3R X-Received: by 2002:a05:6402:4412:b0:42b:a784:3dd2 with SMTP id y18-20020a056402441200b0042ba7843dd2mr10420031eda.162.1653552562206; Thu, 26 May 2022 01:09:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653552562; cv=none; d=google.com; s=arc-20160816; b=ZXFMlLFgrWIDoXkA1Br3h+ja9qKLlFigAhtWrizqanNgpbKIK8UB8hEsSkpeZDDPI5 VoKxCny49KxGW9+7CoW8J9Ek1bvUrCGA2c5nDhYHaTck+J9sEOrL2QZzVObIbIfPwzcs uupBaqUCqYphAIW027H+WqOpQQL11vufJkYQZYPrrmK10VYxlM1gsAn9/Mbd3L/z2lHA n5aPQrNUWb2TI0XJBIZUa0gQBGAsnnJC3avHyc8hcrFldcWXt9TOWBvVrYoy/eSmrAcY Z0Rnn2CXSvJE/D6tLGxG2JqHzM6stOnP/XthUwMRnab7VqGXRnhlM3lzx+B9PROL6bQB QZWg== 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=ZlUHJQCg4koa6h/Gy1pmUYFoM3yaz5L+/zO8Bzq8ichSJGfVgRReAV0Sr21lTPPKSx rXWU4kho0QK9o80lIEg4Yg3I43iV6AuFrPgStfc13vgHW7Y3VjM4iZoq++i57siKGmY/ m6LwD6VT9ZrHw68UCcs1X5dMJRPuRXAM/LYdFTZ8KZaL0uzZTVhsWR9majjQSSxaPfYO S6kwCxmR+oX7UJJc3USi95hdhAtdw/YxB3DPl6kx3znWqW0CLzDLI8seUHuF9Qai7FyC eSuVPCSR17wgbgICHSRhGZw9Wcy+EGRjTsW2Ls4yyTaKM3x+wMpPbq9uOj/pbC3Q9f73 Xstg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GNROocvv; 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 hp9-20020a1709073e0900b006fef7d43e6bsi1053505ejc.596.2022.05.26.01.09.21; Thu, 26 May 2022 01:09:22 -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=GNROocvv; 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 C10CD68B5A6; Thu, 26 May 2022 11:09:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B922168B55D for ; Thu, 26 May 2022 11:08:54 +0300 (EEST) Received: by mail-pj1-f51.google.com with SMTP id v5-20020a17090a7c0500b001df84fa82f8so1096877pjf.5 for ; Thu, 26 May 2022 01:08:54 -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=GNROocvv0KCZFpZmm3TcftZxhaLcU8Gsi9iTionqqYgdXr5YCI9hviTkMjO4Qf3obf +JJ4Cf1qNHnSSb8JgSynwvk7YdF+tBNU6w0JmKLOc/RtSq7MyQqMPW0fFsnHlD6QKcH5 dzGY9mSE80wc3xwxSXeeriarQMl0BUfDYOTCc7eM5RR3DguQVoCoM4U1TBsmtgNlIQwM 8EQV5PC4IQqgxWOTPRJgSCK7hYknpFJkwPbL7EZLKlqYJfCz4q4XcmXHFjYqZUyT7VHS mPE00ocdYZs6G1QgaMGVMZMq3Fwi3ieTtB3xu2uk/QNpjsfNhiQEPv8fPvynzvtrqily 9Q4w== 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=WqNM09CcyBQCl2sscqIRrTeeTSL2JkAi+mkB3YIRvlhXLwIFVEUNMfNELdRz7H6S19 Afs2V9QNVOdMpOS+ztvteqIN+XBv0jPFhqLgUD3ir0Rkjb5/1/A2I/BYDEAmq2yqf1QJ jVykepy1/QosKmhVTWrKlsBraYmphcJrpp4NyOBN3L4dQ6VvYKmcd6WG4WO/hva93k4L w9GT61yobX4un/WmXV7fJF+S4lTPuBJv1NAX41OXqvDe62k1HkfESRJ6YTn5Xv71EhjE c9vQYpDYriuPiG2mOdotaJCBLSQe4DmE5dP/ecInaIc6lxuzQEkB3tFVmKJsfUfxvpzo TTjg== X-Gm-Message-State: AOAM530htchWEbUYJPPH91FiJCTRr1cxLYkNu4fPJjE7iBZ9qs7XjilC 3EinKi2yqEF1bWENTdhtKABzvsxAXnxLXA== X-Received: by 2002:a17:90a:a018:b0:1df:7c2e:5f2 with SMTP id q24-20020a17090aa01800b001df7c2e05f2mr1346025pjp.192.1653552533242; Thu, 26 May 2022 01:08:53 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id a4-20020aa794a4000000b0051830dde570sm828223pfl.20.2022.05.26.01.08.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2022 01:08:52 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <3152156c97733757ceca778a41cb42efb9d71c95.1653552529.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Thu, 26 May 2022 08:08:45 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OY1MP5qpUl1u 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; }