From patchwork Thu May 10 03:08:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8900 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp557356jad; Wed, 9 May 2018 20:09:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoIMrDH9O01wct3rxMjJl8DQW+pMLKtTBO+L8ZG5sCsigJB/130VLzLLpKoUqG5sdu2ceFG X-Received: by 2002:adf:a0b9:: with SMTP id m54-v6mr5036539wrm.76.1525921743496; Wed, 09 May 2018 20:09:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525921743; cv=none; d=google.com; s=arc-20160816; b=SHZ2ksbCRwJrg0J4642Of5+wXjpVeNxJu2cnqA9WvdYoRlktNKXK4He+qzp34Q2FQ3 p5o10jHCj7cy+BjhAZ9QU7RkGWE6onK2ySTujo2ORSSme4QjZZZKqRyWuuow2izAAUHk SiX1msOxn/u7AZLmMA8XqamGz0ReXnni/cWQnp7xEL4AndIVdqj4h0F1cx6wsec9MtrL SeAUVZ+efEFx4J5FniKFjssNQ8/YqR14Y9sj5llLYgA766LanYHesNA+h9UkzNaQ4NSt TRKG825CBKWh47JOcTr2he9DsIOLdhYr6c+xLgJZNeV3U4Y64h6F31K414Xata1LDgWD mTGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=MfM76ZfKVb+x8PZolVXRXmq6vdkJ7ulpwFIf+yubDmk=; b=t+NmR6LSVUGajQP6vFphNd44QXzGKPByWQDzcxzFHp0B2vi8mmiQGl+R54gIWlbuXV vBrg7Dj00y187NeE3wNdUBYPFzP6F3CTiOaXb9pGtD951YLhSlOcJoRUBU8jQtI8eqiU UaXdi7+M2etCeZ9vWLV9vPhHgogrQE/t3R09GQVWKPGWIHjFDp+9xXWwlyjE6TsPzfrD 2Qv47LPRIXi2k9dsgtpz9FogIQYC3CBQBhoMo4sdeQTpvytWRzIZohTXcSOdWTy1WGqL V86gVvdlwLt0E3Pdxo8nWKVkDluHl3a7Cs2X/BnTswiUxL2qkjL39our+WSnfssyCMja 7HWw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a2-v6si4726744wri.27.2018.05.09.20.09.02; Wed, 09 May 2018 20:09:03 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F51F68A6C4; Thu, 10 May 2018 06:08:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 589DA68A592 for ; Thu, 10 May 2018 06:08:17 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2018 20:08:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,383,1520924400"; d="scan'208";a="227258429" Received: from xhh-skl64.sh.intel.com ([10.239.159.70]) by fmsmga005.fm.intel.com with ESMTP; 09 May 2018 20:08:50 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 May 2018 11:08:22 +0800 Message-Id: <20180510030823.15271-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH 1/2] vaapi_encode: Add an assert in vaapi_encode_truncate_gop() 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: Haihao Xiang , Mark Thompson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The flag of input_available must be set when pic_start is not NULL, so add an assert to ensure it is true. In addition, the assert on last_pic is unnecessary now, so remove this assert. Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 36c85a3815..910fd1b365 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -762,6 +762,8 @@ static int vaapi_encode_truncate_gop(AVCodecContext *avctx) VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodePicture *pic, *last_pic, *next; + av_assert0(!ctx->pic_start || ctx->pic_start->input_available); + // Find the last picture we actually have input for. for (pic = ctx->pic_start; pic; pic = pic->next) { if (!pic->input_available) @@ -770,8 +772,6 @@ static int vaapi_encode_truncate_gop(AVCodecContext *avctx) } if (pic) { - av_assert0(last_pic); - if (last_pic->type == PICTURE_TYPE_B) { // Some fixing up is required. Change the type of this // picture to P, then modify preceding B references which