From patchwork Wed Jan 6 03:12:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 24803 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5FEBA44AC29 for ; Wed, 6 Jan 2021 05:13:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB0A168A3A3; Wed, 6 Jan 2021 05:13:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 679BA6808F1 for ; Wed, 6 Jan 2021 05:12:53 +0200 (EET) IronPort-SDR: R7HIMlAT0UnU/iiEifs8hs+CEftpZxz16YuX5mBdd+6pcMAO/HmRytBsODDKG/pAbhFkeLF+a6 b0Zid/y0w7LQ== X-IronPort-AV: E=McAfee;i="6000,8403,9855"; a="164291233" X-IronPort-AV: E=Sophos;i="5.78,478,1599548400"; d="scan'208";a="164291233" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2021 19:12:51 -0800 IronPort-SDR: arugv801/uTcl6g5lnVAt2O2VqIX5G6FLEAaayRPFgUxpl7NVpEnZmrdVwRgH2gQEs4ja+bQHN 04MG8e59sW0w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,478,1599548400"; d="scan'208";a="462536228" Received: from skl-e5-server.sh.intel.com ([10.239.43.170]) by fmsmga001.fm.intel.com with ESMTP; 05 Jan 2021 19:12:50 -0800 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jan 2021 11:12:34 +0800 Message-Id: <20210106031234.13435-1-guangxin.xu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/qsv_enc: do not reuse enc_ctrl from previous frames X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Xu Guangxin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fixes #8857 If we do not clear the enc_ctrl, we will reuse previous frames' data like FrameType. --- libavcodec/qsvenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 2bd2a56227..94473c4eab 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1249,6 +1249,8 @@ static void clear_unused_frames(QSVEncContext *q) while (cur) { if (cur->used && !cur->surface.Data.Locked) { free_encoder_ctrl_payloads(&cur->enc_ctrl); + //do not reuse enc_ctrl from previous frame + memset(&cur->enc_ctrl, 0, sizeof(cur->enc_ctrl)); if (cur->frame->format == AV_PIX_FMT_QSV) { av_frame_unref(cur->frame); }