From patchwork Mon Sep 11 07:52:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 43687 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1973391pzb; Mon, 11 Sep 2023 00:53:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+rWkke64w8Apt2SQmKfa+JvZYVgaHr/EiUAw8mw6t91BdCJsMCV0aMdya2N/B7UneI69a X-Received: by 2002:a17:906:10cf:b0:9a9:e41c:bcb3 with SMTP id v15-20020a17090610cf00b009a9e41cbcb3mr7103305ejv.59.1694418813448; Mon, 11 Sep 2023 00:53:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694418813; cv=none; d=google.com; s=arc-20160816; b=SkaBVj8jz58u3d0EJxtSh6d+hL3pzGBJdt4/+FxBV8iL0wmOSSDwdf5HYNWusex9af dCSFmqjMfRWdmjqGgmyy9Rp2A720GDSHeq3t1wDja4HXmPrrTic9qVOSO/wwQ0iIG+sx 68h8AZGuFJ9P5ZpMV4KQ1GunHldKRK0mET0wjldm01lVx5QFxltFVN7hJe14Pvfe6C9A icETMV/CJVzVPEdYp1R5+6Z7H+6Kr4uMRYMCYAhCkqZRy/L4LKtcDWeAGC+DgjKowiJi YTkdkVaO0AwJPc8l3zrUbvIyL1HBmiV+EbwTzNH3vx5F6qUHX4idmnyVui4rwIvj0koL uynQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=BcbO2/uE6dDwUS1LwABjq0ENfDuqTmxbrrIglul/fv0=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=U7h7/afgRW0c1tdFEf39JxjNAKuztvJy0WN5YwGsoILpGQPVaOdCdlsjYR80RTqhKR 0DhmZjrDWwR3w1yDRrMZzazccaXC1VI91GIILqG7E6nAf3hQxT9isfnOJUH2KbbnVWO+ 276V8sphMG/CoFmhTHdArL9s6pY35N1U+aVSbS/RHjmubcLy88/8V1KpU6L93wj6ItP4 3uVpDTZdRTfFVMCqJaKYJZNhKV/0G6eco0ale2lKtNuf8CTOFCi5tr4SIZTMltNiHePY Vc6nQx3v9Y7a9iteG1E/xGwn5EelNQ7Ewot2XJ3VLv8jA5WUI/P9eMxsPSC5LhBPcmxX WBfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=hX2c8xG9; 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 lf25-20020a170907175900b00989a806b3fasi5963739ejc.1031.2023.09.11.00.53.32; Mon, 11 Sep 2023 00:53:33 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=hX2c8xG9; 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 7529068C935; Mon, 11 Sep 2023 10:53:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A64F468C91B for ; Mon, 11 Sep 2023 10:52:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694418779; x=1725954779; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gm4G3uwVbNXbXGwbhLcPngTgOi2aeH2/Iq7U1UR2Zis=; b=hX2c8xG9s+rX89wW6DqdKBbb14X17roA+hySmHODctZvjYQR9E6gO9pR SdQ05FJfh1iG47n57rQcMlcU6Jfv33NhF7wbWoJWhHS1rx4ULq/hSsTGH jvc951qRWDpcpLGlHUwKyA1Xf7UDMwonHkvizbVGmtACqDtSkCiOnWmP6 sPFBag2zZt7uHJ7OeLBawT7c/sb6IEpbYnmVF2GyPeomynZN+fw/RBaUe KOtLLKXVDI7TLoubgWDYKVGH5HKAfZLuJ7RLIbfuz8h11DlvLJKLY9dBo GF5PvXeQxcQAsax5uXGq1ejQrG4SAnJfVeZjFEbBhhsqkhNBsviiCEPVG A==; X-IronPort-AV: E=McAfee;i="6600,9927,10829"; a="380718549" X-IronPort-AV: E=Sophos;i="6.02,243,1688454000"; d="scan'208";a="380718549" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2023 00:52:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10829"; a="778300395" X-IronPort-AV: E=Sophos;i="6.02,243,1688454000"; d="scan'208";a="778300395" Received: from t-dg2.sh.intel.com ([10.239.159.29]) by orsmga001.jf.intel.com with ESMTP; 11 Sep 2023 00:52:48 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2023 15:52:28 +0800 Message-Id: <20230911075232.797886-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230911075232.797886-1-fei.w.wang@intel.com> References: <20230911075232.797886-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 4/8] lavc/vaapi_encode: Init pic at the beginning of API 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: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wCSSj2enXdTL From: Fei Wang Signed-off-by: Fei Wang Reviewed-by: Neal Gompa --- libavcodec/vaapi_encode.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 0316fe5c18..5ae63c9f25 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1205,7 +1205,7 @@ fail: int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt) { VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodePicture *pic; + VAAPIEncodePicture *pic = NULL; AVFrame *frame = ctx->frame; int err; @@ -1228,8 +1228,6 @@ int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt) } if (ctx->has_sync_buffer_func) { - pic = NULL; - if (av_fifo_can_write(ctx->encode_fifo)) { err = vaapi_encode_pick_next(avctx, &pic); if (!err) { @@ -1255,7 +1253,6 @@ int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt) av_fifo_read(ctx->encode_fifo, &pic, 1); ctx->encode_order = pic->encode_order + 1; } else { - pic = NULL; err = vaapi_encode_pick_next(avctx, &pic); if (err < 0) return err;