From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8D62F40128 for ; Thu, 3 Nov 2022 11:42:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8078668BF33; Thu, 3 Nov 2022 13:41:58 +0200 (EET) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86B5868BF24 for ; Thu, 3 Nov 2022 13:41:46 +0200 (EET) Received: by mail-pg1-f170.google.com with SMTP id b5so1418805pgb.6; Thu, 03 Nov 2022 04:41:46 -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=RCHWjPXqNUuLLdvBqTdcPWzNBsUjMRFsVKmJHVtUbuiA7XWF2uE+qogeaOzw5xywXx GpJ40rwJwrxhPzYYFXxpqjXjBshICYH/W/3kxsRJQtFg3eWFc1/oMe2JCaUxBH0TsgHY MCmHjhtrZ5VV1Cuc5IGNGM9zSYvTaefSUipEzJVBghWGXD9qcFaiaOa/oB1547K2Endk 6MdyDiqgRxDofKfKWlYEB4nr8q5IJRYzWevRMbZj1zj/C0JpJ+m6i2xF5owV/WKdtYfj ui59i7FFoUppCjogzd6xNcNFpJjJKKYmiwM8MShXdWcBY6RaqL3O3rX89bLovfRcBRql eaVg== 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=RtWeB+b7Dfe2eIhilrIU/9Qy1BQ9ouS5K5LvyxjvmtLGhy5Bhhgq0wqsaAtfxFj5Mk 6y5c1wy/u9qTtUEV/CKLGe8q81Dnb2xGZjovOfl+cfxS0JlKW4fapMMz7DwtWH1Kl5Mp E+w0BPNkSZt2bRwfA4WYJawEEHeIpeZLY4egOy3aJ2pf4l6a26IFcdQOZLi1cW7299mj DDFBb3QB4XW17Qss2npwBFAy7+L5t9cizmjG+mIroeggrcqNPt5ogS3rq1kwBHm7JJ/T rX9hfMkPv4B2rQIR1kOFbHr+F43eYocPDl0dRXBTnpX3shY1YmotI78qAGaWfpBhILfm jD5Q== X-Gm-Message-State: ACrzQf2u1eB3d5/VpiXcFzbD5XeWMqOXaiKHGGzVq9/HHnpluxyYlggx 2A7sezydk+TBdsEMuTOKMnjn0gssOrw= X-Google-Smtp-Source: AMsMyM6pSRUiEk/QfmZC7Md0LeLEIHaO5UtEk2Udeu7L2M2IZin6UYmjrprpTWSQi8SOJNJ6m0ztLg== X-Received: by 2002:a63:8049:0:b0:470:1ea5:64ce with SMTP id j70-20020a638049000000b004701ea564cemr1907809pgd.382.1667475704904; Thu, 03 Nov 2022 04:41:44 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id y22-20020a17090a16d600b002139459e121sm3160108pje.27.2022.11.03.04.41.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Nov 2022 04:41:44 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <0e71469a871acee9c9f1305dbb86a7c48938a33b.1667475701.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Thu, 03 Nov 2022 11:41:41 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 2/2] avfilter/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" , Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; } -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".