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 81B1C44A9C for ; Tue, 1 Nov 2022 09:18:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3847468BE83; Tue, 1 Nov 2022 11:18:04 +0200 (EET) Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C85368BE54 for ; Tue, 1 Nov 2022 11:17:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1667294273; bh=w2uzqDQLyCkKA+p96p9ka/qK9GgVOtCUEmfz6UcjrhE=; h=From:Subject:Date:References:To:In-Reply-To; b=DY5zZwgKANLGpC6WSook9m+teuBxNeaceJ1w1I6TJtUN0EVORB7iKOomfENhXAGo0 jymBIemsqmoBOZYcrorqvxqZk4WsOal+nf/Wb35lVRVJ9V7Gu7ggxyhfezGFGxTXC5 zYqVeBJ/0rcRCX4jh2GIoxJYstGI+5P3DozByqbo= Received: from smtpclient.apple ([119.147.10.186]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 47414631; Tue, 01 Nov 2022 17:17:52 +0800 X-QQ-mid: xmsmtpt1667294272t9yal4jm7 Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTckLIH2MpSWS5ZAifhhGBL6lgS8Bu/0sJ0zVjjkvNGx+X527uEz 2Dd2bPurxdpmIYitK6FG3yiYylPmT2Vq4EIvWjL8YXFKaCP5U27RQWyYJ9lu0GY4ZPKlsfXYe+gb SLTuy1U/P+z1eEHMibvlWtqapQ2XaYLJbPZh3XeqwI8NMTY3SVoCVbQZAAUpbCGVabt9T2vVXrwR 6IT+eXLEaaPG2803XyKZ6m7cG4CvOizDt/LdLsgt+yly44hJMA0MfpuFCP+hiZz9dBH1+4K60Bs/ Fh6O4dFHZHqlrmSyGerrICK+AAb/H6RitSKivoNW6ywOPhf0632fQ0GWpVpw0fAIOi4Jj3awa7G6 OLgFiVCIkNs1IZsZG49j1VIkVO55Uiv+OPLo1qaBX1aLmKbcbiExv9C78yxKZyLs+29kmJh7q6Ht uwHZwZV7GN4lACc0BeLfVH+cwXqeIgV2HmXN8vVA1Bm3uNOYEmD8VB1UXMhUP5p0KT7q5UfoIGbi JIBJL7WAGppHYDdG+cnmhJUB+kHHXkBYe4NjdEx0u7pyvhJHQO6jRG2yQHDf/5Lpy+Tgfkwm09go oDOOJRM+krwv7Vi8Nj9g85/dMy814UveB6pbdlCq40g2vzrCTNu9LGnzH3/OViAVPuLNI3hsce2j TwqDLGgxBq5TBQLr8ZpCMW3JgaC+ifauft5pSX1F0vagkON3ElIHhqWC03QtdLmjcBe/CCflyjgM 1I63azaGi+5dxZyxgGg6SOpbXaIOf0q47HZ0ILIuGg/V2ZT3VzhpXkbUu0FyspKGqlCLEE5PuZCq j97v0uwTTEteo5L+y9/ewWXDVs8CZY5PvgKAYyLt2dNO/il/+3c+azGIwOk4U59THqRSMfc8w8JL vYKnPP+sGmhrQ8ABxJuayexorzKZrG2quwpOnBlbZ5+4IDYOLaCjKNsj7pG/URXPy48fVWM8hVrd kFIBHB8YrCxb1kBuSZSYEhmmPrEYsjAxovbVGZwE4gMIkCrKio/w== From: =?utf-8?B?InpoaWxpemhhbyjotbXlv5fnq4spIg==?= Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Date: Tue, 1 Nov 2022 17:17:52 +0800 References: <43eb3257afeb4d93bac31fe593e6edffb2a09e50.1666652664.git.ffmpegagent@gmail.com> To: FFmpeg development discussions and patches In-Reply-To: X-OQ-MSGID: <16B7EA41-E100-4EC4-9216-D5EC3E71CF6F@foxmail.com> X-Mailer: Apple Mail (2.3696.120.41.1.1) Subject: Re: [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 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: > On Nov 1, 2022, at 12:58, Xiang, Haihao wrote: > > On Mon, 2022-10-24 at 23:04 +0000, softworkz wrote: >> 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; >> } > > Patchset LGTM, I'll push this patchset if no more comment or objection. avcodec/vpp_qsv: Copy side data from input to output frame ^^^^^^^ avcodec -> avfilter > > Thanks > Haihao > > _______________________________________________ > 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". _______________________________________________ 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".