From patchwork Thu Dec 28 03:10:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 45358 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp3962838pzh; Wed, 27 Dec 2023 19:12:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IGurXHPuf2+h0tI35UK2r2kBYbw+oITPAihfoyURC2V2bWP/bQJWebtLfWAgCDtCaww3WTL X-Received: by 2002:a2e:9787:0:b0:2cc:b51b:239d with SMTP id y7-20020a2e9787000000b002ccb51b239dmr3569608lji.66.1703733141632; Wed, 27 Dec 2023 19:12:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703733141; cv=none; d=google.com; s=arc-20160816; b=BEmanqCMgA6IQRWCcLJN/5VoAgC/GTCh/6XYNjbpMUeI6XfVSv6ViQBbpaVoU5iJxB QzKkHTv3rg40HTLwc2NGsqy7ksFHw0u2hOEzdaRrv9f3Yp+4HpmRkFsMydX7Nj9ETJ3W 6p4RWT9jTbvygWYtMpDsV6JHroR9J9yMBl8eN8HzO+G10oWwB2ekvxLRmmWtjwzBKHWP l1NoKkeZKXw+Ei8x5UF0M6oaY5OgZPYc+ynvgD4+LrY4OqL5cVmSsd/tqlvVb7aua96P TGEv1vSqjbeDmOdPpnjNRK04Tx+Ac7v9LsuMIuD1yRqaxjfH3It5trfv4mAo2r1UbtO7 Fybw== 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=jvxTNUHcIVZLcqCyQTeUbq0SgyXrQO/MMSC0QEp1b+0=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=PsQxnUek2ivv5MzFDryak8ZP3jg+JloOAmYkNLKC7g7M8ERMDHEdiAKncSJJ9f29XP 27aJ4C6j51Yrzxsvg5MCyBWVdoNrOhaQkPXs8pwETHN00uEMVMHxQI7bEsxYI5PkIiuq VzWGzcspcVypyYYcQy/H1JMLU1AlQd2DmLtVRMsy/aGfT5yDJB4D4zdD5cQqtqAQxDle 6Ef/TSmcXJ3luZhCjNLwEnHeCDlbSxuNLZBhp5BElY7A8jjtgbZQj8UkoyQt9CiEMpq1 jkkWrL1UdTMu/d+o/Tgo5C6vW1uks2AIOJBvmBKM7zqXPK+hjLHA2FnmOp1orV2qlVJd NAaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=dXy1rOvV; 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 i10-20020a50d74a000000b0055462486076si5301662edj.579.2023.12.27.19.12.21; Wed, 27 Dec 2023 19:12:21 -0800 (PST) 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=dXy1rOvV; 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 91A1B68CAFA; Thu, 28 Dec 2023 05:11:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C67468CA5B for ; Thu, 28 Dec 2023 05:11:48 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703733115; x=1735269115; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hBO+R0CG20f8KPsw3iDy62X9KmzMJwraG4okJ30nGl4=; b=dXy1rOvVqPQsfZlXPccDcvS+kMskbuRJ7DgYM9fnmGvJplrdBa0F0BJr 8nlcOQFdRMqtmz9cTnyhW3rFian2s9/OcdGuI5gcgdvbDMxi2FWKYh7Jm vJZBRPaIwiSrgLFdgasts6EkMemtiVqbmhukgPh2P9BtAoHanEUHedG98 ir/UxYU4k4av3KLOIepv2ldpOCq1UCbofbDx+gUHBzzwO/qroL9AYqJzh yZ6TV/HQEU/hjzJtsuc9OVAaHXuWmjq+dEJsNkBecSTJbNLzs5J8QTFkk 0LTpT+vBzIaTHma+aTeZGXyzgCSbotp8y18C/xFT6lmjWBnhBisQhGt4l A==; X-IronPort-AV: E=McAfee;i="6600,9927,10936"; a="15170728" X-IronPort-AV: E=Sophos;i="6.04,310,1695711600"; d="scan'208";a="15170728" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2023 19:11:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10936"; a="921990428" X-IronPort-AV: E=Sophos;i="6.04,310,1695711600"; d="scan'208";a="921990428" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmsmga001.fm.intel.com with ESMTP; 27 Dec 2023 19:11:34 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Dec 2023 11:10:42 +0800 Message-ID: <20231228031042.1129-5-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20231228031042.1129-1-tong1.wu@intel.com> References: <20231228031042.1129-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/5] avcodec/dxva2(h264|mpeg2|vc1): use av_assert0 instead of assert 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RXeQ5Tc2ATTV Signed-off-by: Tong Wu --- libavcodec/dxva2.c | 4 ++-- libavcodec/dxva2_h264.c | 16 ++++++++-------- libavcodec/dxva2_mpeg2.c | 2 +- libavcodec/dxva2_vc1.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index a6ad5e4dc7..ec0d9e7d1c 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include +#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/log.h" #include "libavutil/time.h" @@ -1012,7 +1012,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, /* TODO Film Grain when possible */ - assert(buffer_count == 1 + (qm_size > 0) + 2); + av_assert0(buffer_count == 1 + (qm_size > 0) + 2); #if CONFIG_D3D11VA if (ff_dxva2_is_d3d11(avctx)) diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index e0ec4878a7..0fe4152625 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -44,7 +44,7 @@ struct dxva2_picture_context { static void fill_picture_entry(DXVA_PicEntry_H264 *pic, unsigned index, unsigned flag) { - assert((index&0x7f) == index && (flag&0x01) == flag); + av_assert0((index&0x7f) == index && (flag&0x01) == flag); pic->bPicEntry = index | (flag << 7); } @@ -194,8 +194,8 @@ void ff_dxva2_h264_fill_scaling_lists(const AVCodecContext *avctx, AVDXVAContext static int is_slice_short(const AVCodecContext *avctx, AVDXVAContext *ctx) { - assert(DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 1 || - DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2); + av_assert0(DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 1 || + DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2); return DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2; } @@ -348,10 +348,10 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, static const unsigned start_code_size = sizeof(start_code); unsigned position, size; - assert(offsetof(DXVA_Slice_H264_Short, BSNALunitDataLocation) == - offsetof(DXVA_Slice_H264_Long, BSNALunitDataLocation)); - assert(offsetof(DXVA_Slice_H264_Short, SliceBytesInBuffer) == - offsetof(DXVA_Slice_H264_Long, SliceBytesInBuffer)); + av_assert0(offsetof(DXVA_Slice_H264_Short, BSNALunitDataLocation) == + offsetof(DXVA_Slice_H264_Long, BSNALunitDataLocation)); + av_assert0(offsetof(DXVA_Slice_H264_Short, SliceBytesInBuffer) == + offsetof(DXVA_Slice_H264_Long, SliceBytesInBuffer)); if (is_slice_short(avctx, ctx)) slice = &ctx_pic->slice_short[i]; @@ -453,7 +453,7 @@ static int dxva2_h264_start_frame(AVCodecContext *avctx, if (!DXVA_CONTEXT_VALID(avctx, ctx)) return -1; - assert(ctx_pic); + av_assert0(ctx_pic); /* Fill up DXVA_PicParams_H264 */ ff_dxva2_h264_fill_picture_parameters(avctx, ctx, &ctx_pic->pp); diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index 4c9ed1d761..d31a8bb872 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -264,7 +264,7 @@ static int dxva2_mpeg2_start_frame(AVCodecContext *avctx, if (!DXVA_CONTEXT_VALID(avctx, ctx)) return -1; - assert(ctx_pic); + av_assert0(ctx_pic); ff_dxva2_mpeg2_fill_picture_parameters(avctx, ctx, &ctx_pic->pp); ff_dxva2_mpeg2_fill_quantization_matrices(avctx, ctx, &ctx_pic->qm); diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 2b1b3f97ea..f7513b2b15 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -321,7 +321,7 @@ static int dxva2_vc1_start_frame(AVCodecContext *avctx, if (!DXVA_CONTEXT_VALID(avctx, ctx)) return -1; - assert(ctx_pic); + av_assert0(ctx_pic); ff_dxva2_vc1_fill_picture_parameters(avctx, ctx, &ctx_pic->pp);