[FFmpeg-devel] [PATCH v5 03/24] avcodec/h264dec: remove FF_ALLOCZ_ARRAY_OR_GOTO and gotos lable
lance.lmwang at gmail.com
lance.lmwang at gmail.com
Thu Jun 4 08:11:50 EEST 2020
From: Limin Wang <lance.lmwang at gmail.com>
Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
---
libavcodec/h264dec.c | 60 +++++++++++++++-------------------------------------
libavutil/internal.h | 3 +++
2 files changed, 20 insertions(+), 43 deletions(-)
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index 66f45e6..1e2ca68 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -185,38 +185,24 @@ int ff_h264_alloc_tables(H264Context *h)
const int st_size = big_mb_num + h->mb_stride;
int x, y;
- FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->intra4x4_pred_mode,
- row_mb_num, 8 * sizeof(uint8_t), fail)
+ if (!FF_ALLOCZ_TYPED_ARRAY(h->intra4x4_pred_mode, row_mb_num * 8) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->non_zero_count, big_mb_num) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->slice_table_base, st_size) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->cbp_table, big_mb_num) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->chroma_pred_mode_table, big_mb_num) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->mvd_table[0], row_mb_num * 8) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->mvd_table[1], row_mb_num * 8) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->direct_table, big_mb_num * 4) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->list_counts, big_mb_num) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->mb2b_xy, big_mb_num) ||
+ !FF_ALLOCZ_TYPED_ARRAY(h->mb2br_xy, big_mb_num))
+ return AVERROR(ENOMEM);
h->slice_ctx[0].intra4x4_pred_mode = h->intra4x4_pred_mode;
-
- FF_ALLOCZ_OR_GOTO(h->avctx, h->non_zero_count,
- big_mb_num * 48 * sizeof(uint8_t), fail)
- FF_ALLOCZ_OR_GOTO(h->avctx, h->slice_table_base,
- st_size * sizeof(*h->slice_table_base), fail)
- FF_ALLOCZ_OR_GOTO(h->avctx, h->cbp_table,
- big_mb_num * sizeof(uint16_t), fail)
- FF_ALLOCZ_OR_GOTO(h->avctx, h->chroma_pred_mode_table,
- big_mb_num * sizeof(uint8_t), fail)
- FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[0],
- row_mb_num, 16 * sizeof(uint8_t), fail);
- FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[1],
- row_mb_num, 16 * sizeof(uint8_t), fail);
h->slice_ctx[0].mvd_table[0] = h->mvd_table[0];
h->slice_ctx[0].mvd_table[1] = h->mvd_table[1];
-
- FF_ALLOCZ_OR_GOTO(h->avctx, h->direct_table,
- 4 * big_mb_num * sizeof(uint8_t), fail);
- FF_ALLOCZ_OR_GOTO(h->avctx, h->list_counts,
- big_mb_num * sizeof(uint8_t), fail)
-
memset(h->slice_table_base, -1,
st_size * sizeof(*h->slice_table_base));
h->slice_table = h->slice_table_base + h->mb_stride * 2 + 1;
-
- FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2b_xy,
- big_mb_num * sizeof(uint32_t), fail);
- FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2br_xy,
- big_mb_num * sizeof(uint32_t), fail);
for (y = 0; y < h->mb_height; y++)
for (x = 0; x < h->mb_width; x++) {
const int mb_xy = x + y * h->mb_stride;
@@ -227,9 +213,6 @@ int ff_h264_alloc_tables(H264Context *h)
}
return 0;
-
-fail:
- return AVERROR(ENOMEM);
}
/**
@@ -270,8 +253,11 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl)
er->b8_stride = h->mb_width * 2 + 1;
// error resilience code looks cleaner with this
- FF_ALLOCZ_OR_GOTO(h->avctx, er->mb_index2xy,
- (h->mb_num + 1) * sizeof(int), fail);
+ if (!FF_ALLOCZ_TYPED_ARRAY(er->mb_index2xy, h->mb_num + 1) ||
+ !FF_ALLOCZ_TYPED_ARRAY(er->error_status_table, mb_array_size) ||
+ !FF_ALLOCZ_TYPED_ARRAY(er->er_temp_buffer, er_size) ||
+ !FF_ALLOCZ_TYPED_ARRAY(sl->dc_val_base, yc_size))
+ return AVERROR(ENOMEM); // ff_h264_free_tables will clean up for us
for (y = 0; y < h->mb_height; y++)
for (x = 0; x < h->mb_width; x++)
@@ -279,15 +265,6 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl)
er->mb_index2xy[h->mb_height * h->mb_width] = (h->mb_height - 1) *
h->mb_stride + h->mb_width;
-
- FF_ALLOCZ_OR_GOTO(h->avctx, er->error_status_table,
- mb_array_size * sizeof(uint8_t), fail);
-
- FF_ALLOC_OR_GOTO(h->avctx, er->er_temp_buffer,
- er_size * sizeof(uint8_t), fail);
-
- FF_ALLOCZ_OR_GOTO(h->avctx, sl->dc_val_base,
- yc_size * sizeof(int16_t), fail);
er->dc_val[0] = sl->dc_val_base + h->mb_width * 2 + 2;
er->dc_val[1] = sl->dc_val_base + y_size + h->mb_stride + 1;
er->dc_val[2] = er->dc_val[1] + c_size;
@@ -296,9 +273,6 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl)
}
return 0;
-
-fail:
- return AVERROR(ENOMEM); // ff_h264_free_tables will clean up for us
}
static int h264_init_context(AVCodecContext *avctx, H264Context *h)
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 4acbcf5..00f1a57 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -137,6 +137,9 @@
# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
#endif
+#define FF_ALLOC_TYPED_ARRAY(p, nelem) (p = av_malloc_array(nelem, sizeof(*p)))
+#define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_mallocz_array(nelem, sizeof(*p)))
+
#define FF_ALLOC_OR_GOTO(ctx, p, size, label)\
{\
p = av_malloc(size);\
--
1.8.3.1
More information about the ffmpeg-devel
mailing list