From patchwork Mon Dec 25 14:18:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 45320 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp2578165pzh; Mon, 25 Dec 2023 06:20:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQ5vk4VUkKCOCMRjxw9sizKO9YnT4hctxNYP29YDaO+RkaFhyxD5dSUC1YoAXPmsWjIsGQ X-Received: by 2002:a05:600c:524c:b0:40d:2522:1164 with SMTP id fc12-20020a05600c524c00b0040d25221164mr4261574wmb.82.1703514056684; Mon, 25 Dec 2023 06:20:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703514056; cv=none; d=google.com; s=arc-20160816; b=et3wxfh8pxYAyHStm+T5UbW6BPzvTZWvndxUz/QVDu/LIX/ivq7/5odQIvOqvMEjF/ Ct7e89+txiRmWfrs2Xa3xdB0FgycnMqYPpGLsE7qsd6hRug7y0w40zy9HIxOPhcaHpeB ujSjN4QewVpaXfhnVAnV6Oq9n148UdgPX/xxe1ZZe8WZMXVl+5GqXGlclKNx5ac34FLq LUiSRvn91aqSPEI+IBJD8HDY7b27GaodqcwRJPwApK9fjgrw1j3Un0Pc+z/B7d2FA+GP lUU71huLih9BJqoR6xGjKJOn9XXETWMDNgi8zi48stIEitMJbOM9S54uVY+Dc2yWobvn eA+w== 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=xhwKnz7Pa5qQSDPpzhJx05QzqjBilqlhb/NqbNw/1I0=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=Y9fe2fhvHCfXVjtfaCf0GGWoicCeGZmVTlC1Qqy0jXlG6L1UDC/H773dPVyuzc8+gU sdzweOmYKS0e2SJ8GvhdAW9zmj20bH/64S4WVdXgYEivHZ1qvpS1h0K/neSgusKLU7mu 5TTMMd+aNZsmaGpo4bvvVOrTzaRo9XmT5AwiyzauT7KPAvsaUoSkbui059hf0KFLYCX7 gWT0oJPBcgPTtM7CpO28J4Gg9pO1z3qrW1zQGusXL53681j9kEy/5qUyDnOEKWIo2lfv cC+g5XEUjyc3ni1XN0xI+h6cxeeb3YAbKxYTZkAgxvRwW9AP/PoCp0FhIE/x5rvqWX/j e9OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=CVG7Amwb; 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 gk2-20020a17090790c200b00a26e106b1absi1748824ejb.817.2023.12.25.06.20.55; Mon, 25 Dec 2023 06:20:56 -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=CVG7Amwb; 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 6A0D968D1B1; Mon, 25 Dec 2023 16:20:28 +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.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E777568D1A2 for ; Mon, 25 Dec 2023 16:20:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703514025; x=1735050025; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BguR08owocsVcWdwYwJLRo/mKwZsz1/97B1Jch67Hho=; b=CVG7Amwbx0rZ4ktL+Zon6DHoiTIFGhXfLi4ZqH2wVxZdIo6+a4dwAvWi Y1RwRlwdmyj5HrETrcRcIq2zwzTty34V8lSbtRQilUfgHoFLNqSS9O5BD NZT20F4OJkdDNW9cNsCemXqPwN94u05ATDGmaljt35foxjchZ+xGprkB2 7xku3/ESLG9YMPkpGoUmqXeIgPzdzQD9vuIMWdVams38wHnixhVr9gcMF fwYRCxEQr1rYR4JtEcuOkd48NOWp7LBzzl60NDF3P9b3Fb5qSWwBMQ7nY 725LpcDHDbKHnk5F5WCDv+8kv3Bd2gI63IyzvMcuWHs2+UFbckThksy8d g==; X-IronPort-AV: E=McAfee;i="6600,9927,10934"; a="9690321" X-IronPort-AV: E=Sophos;i="6.04,303,1695711600"; d="scan'208";a="9690321" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Dec 2023 06:19:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10934"; a="1024915297" X-IronPort-AV: E=Sophos;i="6.04,303,1695711600"; d="scan'208";a="1024915297" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmsmga006.fm.intel.com with ESMTP; 25 Dec 2023 06:19:57 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2023 22:18:58 +0800 Message-ID: <20231225141859.664-5-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20231225141859.664-1-tong1.wu@intel.com> References: <20231225141859.664-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: DhX5bSh1JFte Signed-off-by: Tong Wu --- libavcodec/dxva2.c | 6 +++--- libavcodec/dxva2_h264.c | 16 ++++++++-------- libavcodec/dxva2_mpeg2.c | 2 +- libavcodec/dxva2_vc1.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 7160a0008b..c60393a60b 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" @@ -795,7 +795,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, } #endif - assert(0); + av_assert0(0); return 0; } @@ -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);