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 3C2F142BF5 for ; Wed, 1 Jun 2022 09:07:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B6FE68B724; Wed, 1 Jun 2022 12:06:25 +0300 (EEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72A7668B630 for ; Wed, 1 Jun 2022 12:06:11 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id e11so1396833pfj.5; Wed, 01 Jun 2022 02:06:11 -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=VKs6xp1anbv17cHfPufBXlYJLe7r4J1CKO46KaDbxl3V/Rinq4wo/dvQBJwpytzaPG 6H3w5Ko+B48Rj7b9R/KLRhLiG2gr6zcwqV0DBIdMnIn0Lb5cjGhusK1EeSzl8ok9agWF nWmf0Itp59xr+n4U38ECID3oJorx8LTcMRgPD9C04e8tLIQqhtJl0B25QsciFth3oFtq 6WcSOiX8ejleMO4zgL3axWPgmUz9v0yXg3aevs5KaMrUwpoWuLKQvx9OuFAetM+cRlRs BTBlNp37+V6+z3srEC4JOQdD+16t9h2g5qmZH7nfKfq3EsxCClueHcHuzCTnO5KaVxva on1A== 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=tvDYXU8Vz55+fRqC/uEunMkLJUYdg9JB4pp80AVDV62uJYQaTdNY9k6YtPkljXp/6q sok4wKy9V2f6cIyKckTVKl9dYX1aXmPCdlB8GglV8O+E3Q1w0NWDlyftEGfvc7VIjUro XNPrShH0krWGs3S4MwZ3DvvbQwVmDPwvbmqW9UacURa9P+XHyhsoud7IGP/t2L5vIQ5r GP3l+r0qpZ+C5dfMJNfRyUucmAxIGsRxZBgCAWRPyF+mhjsciOccHNzjIWwrp/01zFro tdJJUp8vTlSdqlS8U52c2ua/5Fpi+N6cNBp1oqNFAmz9FzDnoyK0nicmKnE/LncwiToM jMlA== X-Gm-Message-State: AOAM5310VAwvYSKg7fs3dBB7IufccrtbfcI4hCB+Nqow1l92U8y1ZY/i TKsebB+bHv7EPFzqmNUWRoJLAogjkRc= X-Google-Smtp-Source: ABdhPJzf/hsKs3Dla4UL5+0TXhxjfOCDKyoGMsS585aBr4HjB0RfpJjeM8Cr+iyjukEatPn18iZJSw== X-Received: by 2002:a63:69c1:0:b0:3fa:e815:a761 with SMTP id e184-20020a6369c1000000b003fae815a761mr28749433pgc.268.1654074369693; Wed, 01 Jun 2022 02:06:09 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id z15-20020a63b90f000000b003fc95548840sm874859pge.36.2022.06.01.02.06.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 02:06:09 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <3152156c97733757ceca778a41cb42efb9d71c95.1654074366.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 01 Jun 2022 09:06:02 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 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" 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 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; } -- 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".