LAV
/
FFmpeg
1
0
Fork 0
Code

avcodec/dxva2(h264|mpeg2|vc1): use av_assert0 instead of assert 

Signed-off-by: Tong Wu <tong1.wu@intel.com>
This commit is contained in:
Tong Wu 2023-12-28 11:10:42 +08:00 committed by Haihao Xiang
parent 0f01581ccd
commit 270cd14bbb
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dxva2.c
View File

@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <assert.h>
#include <string.h>
#include <initguid.h>
#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))

16
libavcodec/dxva2_h264.c
View File

@ -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);

2
libavcodec/dxva2_mpeg2.c
View File

@ -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);

2
libavcodec/dxva2_vc1.c
View File

@ -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);