From patchwork Wed Jun 1 18:01:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3581481pzj; Wed, 1 Jun 2022 11:02:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtwCylQ48FsGbQZhRyjzieZcQ5JrrExp0ulaTTc7ma8jnFMn7UTfDAqAvdpdU1dLVJgvVh X-Received: by 2002:aa7:d303:0:b0:42d:d192:4c41 with SMTP id p3-20020aa7d303000000b0042dd1924c41mr1082537edq.178.1654106567641; Wed, 01 Jun 2022 11:02:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106567; cv=none; d=google.com; s=arc-20160816; b=P4IUULyehfE1m4xq0sqjk23DNbrv2jfFIdvb7xjddDvA6WexgFOokfGOcftfx9dKDS vSz8/mTHmS0Q4/zbIqkpUhE4BaFQ3bS3mRNk/VaWapU+DFX8Y7Ln246TyQrjzkQL/lVx M6UL4WkSOXiiVilF4g9p77xS6fqBXxvc0+I1CxFGj/m9xP4IZH0a3XV/QSM4+rQ22Aqz dsbiIqrSN/PzP5lwP2M1h2wv0TzslptVOJQfdSZq+AsKCuVpVTTsdChU7K7TUY5gJPGf b7MLKPAT0Wmr01kFaJz6aQ/5Lkl8vox81V1hKEnZly2owptSTW5pSTb5qSsXFZLG6Jn6 Qvug== 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=rGj3sE0ceekNq2yMuGKHR/tMC1oJtEdh106yQQvZJ06M28gxv/9uz/FpzTiIxQep98 qdxrM6fhEpLqS7aCxWHLwSYkgLO+DnRAT359mAmEbNEIFO7WUczeW68iUCjTx+m5X706 JHJHudXjDeNRGfwdy/wsiJ4Vw6ynPkCk9W+XAEu/CgAYWcBTAfiTK2CeMeIogelxydzR A77mjnxkgGpdeOcdTrd9ayGtgxNEyaBtJNF0GXtATgCFV3VfT2Oyu5GH0oTe8ukDgAFi ambKz6FZNeue3HFvVTjqjzUbZ+8ixCpLVlj8f8siqaEgEESAMymLNJ6ddlRNM5x5Ugy1 Ut4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fRRzHxwA; 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 nc25-20020a1709071c1900b006e87aadf6casi1484787ejc.965.2022.06.01.11.02.47; Wed, 01 Jun 2022 11:02:47 -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=fRRzHxwA; 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 8AD2C68B797; Wed, 1 Jun 2022 21:02:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A101B68B766 for ; Wed, 1 Jun 2022 21:01:51 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id o6-20020a17090a0a0600b001e2c6566046so7050383pjo.0; Wed, 01 Jun 2022 11:01:51 -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=fRRzHxwA0kM+O06gQIHkGxSfhAG3B2FlK5BxR2mRRHXeF+oJsjJjAfLd0Mh0CFZr1p sQU38nnRMTCdQ894UJMEG8j3KMVVB6f6tGdtqJ6wfhHeUPW8yUWm55K2ZqUboDczlhCZ JF7+yMT0OQ2WtRfkvkdLQGyK1QSmVqXj4qzv21r3kj08v9rJ1Bz1PoEQhW1HYuAQTWXe QTtKgZH6vzvvjIKhXvNzd3RbtP8I/bg8a4Uw43Mo/Z68u4BM/H6cZAaYQXyOlvR8pn8i F1PfITc7Q5b6GZI1us4PhjfujcUpZ6n9dI6wN6F48wbP2pI4AA79yQmonarF5SPaP8BF nKhw== 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=McMcawDPJ4C5E079iOILkmXWCXNfkINaaUdEvjMv/dGjEq6JoJRsG5DswInXevSrj9 p2BVpLPTr/PqIVLHerhFAhmlAu79tkxIdF4QlcS6jMLWebGaoh9MqgsQRCxxeI0nc3mO z5HG9GDy/fz9QKZmO//n+kBmuvbY9K+nmX2Si9GAHQ1V+BIklOj5Y+dVaeYLYVF0WnsP tqqeaaCs5DRc06tF0UTdx6xrG/xsMOeiHncqU+mgZwpG2pwU2VjgERRf9ykbPKiYwubI hatobzKtVnlbJn9fG9yLd723ELi8HXlu41AFGIiwPx9cXop0+/rsK9kSag31Br7zn7m5 /LcQ== X-Gm-Message-State: AOAM533D097xyz5jqfM8KtEPhei3GW5PCXl75iASmkTrJsXJX2xHdU2p D70gobJVRKKfNydC5oTiLzgiM63VTCs= X-Received: by 2002:a17:90b:2245:b0:1e0:6ad6:33c with SMTP id hk5-20020a17090b224500b001e06ad6033cmr615062pjb.86.1654106510115; Wed, 01 Jun 2022 11:01:50 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id v11-20020a62a50b000000b0051ba97b788bsm1798759pfm.27.2022.06.01.11.01.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 11:01:49 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <6f50d0bd578c9a240e01e94bd4f5d873d076d62f.1654106506.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 01 Jun 2022 18:01:42 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 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 , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /HYRNEBbOfWJ 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; }