From a6931d8ecea17aa232157f89abdbe7afbb93a8db Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 9 Mar 2013 20:37:11 +0100 Subject: [PATCH 1/2] h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro. This way it does not look like a constant. --- libavcodec/dxva2_h264.c | 2 +- libavcodec/h264.c | 12 ++++++------ libavcodec/h264.h | 2 +- libavcodec/vaapi_h264.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index e71d9e36a1..6457824b6f 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -206,7 +206,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, slice->SliceBytesInBuffer = size; slice->wBadSliceChopping = 0; - slice->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE) * h->mb_width + h->mb_x; + slice->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + h->mb_x; slice->NumMbsForSlice = 0; /* XXX it is set once we have all slices */ slice->BitOffsetToSliceData = get_bits_count(&h->gb); slice->slice_type = ff_h264_get_slice_type(h); diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 14369ac70c..c81ba5e797 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1862,7 +1862,7 @@ static void decode_postinit(H264Context *h, int setup_finished) break; case SEI_PIC_STRUCT_TOP_BOTTOM: case SEI_PIC_STRUCT_BOTTOM_TOP: - if (FIELD_OR_MBAFF_PICTURE) + if (FIELD_OR_MBAFF_PICTURE(h)) cur->f.interlaced_frame = 1; else // try to flag soft telecine progressive @@ -1888,7 +1888,7 @@ static void decode_postinit(H264Context *h, int setup_finished) cur->f.interlaced_frame = (h->sei_ct_type & (1 << 1)) != 0; } else { /* Derive interlacing flag from used decoding process. */ - cur->f.interlaced_frame = FIELD_OR_MBAFF_PICTURE; + cur->f.interlaced_frame = FIELD_OR_MBAFF_PICTURE(h); } h->prev_interlaced_frame = cur->f.interlaced_frame; @@ -3448,13 +3448,13 @@ static int decode_slice_header(H264Context *h, H264Context *h0) h->cur_pic_ptr->frame_num = h->frame_num; // FIXME frame_num cleanup assert(h->mb_num == h->mb_width * h->mb_height); - if (first_mb_in_slice << FIELD_OR_MBAFF_PICTURE >= h->mb_num || + if (first_mb_in_slice << FIELD_OR_MBAFF_PICTURE(h) >= h->mb_num || first_mb_in_slice >= h->mb_num) { av_log(h->avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n"); return -1; } h->resync_mb_x = h->mb_x = first_mb_in_slice % h->mb_width; - h->resync_mb_y = h->mb_y = (first_mb_in_slice / h->mb_width) << FIELD_OR_MBAFF_PICTURE; + h->resync_mb_y = h->mb_y = (first_mb_in_slice / h->mb_width) << FIELD_OR_MBAFF_PICTURE(h); if (h->picture_structure == PICT_BOTTOM_FIELD) h->resync_mb_y = h->mb_y = h->mb_y + 1; assert(h->mb_y < h->mb_height); @@ -4163,7 +4163,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) h->mb_x = lf_x_start = 0; decode_finish_row(h); ++h->mb_y; - if (FIELD_OR_MBAFF_PICTURE) { + if (FIELD_OR_MBAFF_PICTURE(h)) { ++h->mb_y; if (FRAME_MBAFF(h) && h->mb_y < h->mb_height) predict_field_decoding_flag(h); @@ -4210,7 +4210,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) h->mb_x = lf_x_start = 0; decode_finish_row(h); ++h->mb_y; - if (FIELD_OR_MBAFF_PICTURE) { + if (FIELD_OR_MBAFF_PICTURE(h)) { ++h->mb_y; if (FRAME_MBAFF(h) && h->mb_y < h->mb_height) predict_field_decoding_flag(h); diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 66708c04c6..7218cb7d27 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -79,7 +79,7 @@ #define LBOT 0 #define LEFT(i) 0 #endif -#define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF(h) || FIELD_PICTURE(h)) +#define FIELD_OR_MBAFF_PICTURE(h) (FRAME_MBAFF(h) || FIELD_PICTURE(h)) #ifndef CABAC #define CABAC h->pps.cabac diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 7cbe8c1826..dfa2ec7bb8 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -324,7 +324,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, if (!slice_param) return -1; slice_param->slice_data_bit_offset = get_bits_count(&h->gb) + 8; /* bit buffer started beyond nal_unit_type */ - slice_param->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE) * h->mb_width + h->mb_x; + slice_param->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + h->mb_x; slice_param->slice_type = ff_h264_get_slice_type(h); slice_param->direct_spatial_mv_pred_flag = h->slice_type == AV_PICTURE_TYPE_B ? h->direct_spatial_mv_pred : 0; slice_param->num_ref_idx_l0_active_minus1 = h->list_count > 0 ? h->ref_count[0] - 1 : 0; From 6d2b6f21eb45ffbda1103c772060303648714832 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 9 Mar 2013 20:37:11 +0100 Subject: [PATCH 2/2] h264: add a parameter to the CABAC macro. This way it does not look like a constant. --- libavcodec/h264.c | 2 +- libavcodec/h264.h | 6 +++--- libavcodec/h264_cabac.c | 4 ++-- libavcodec/h264_cavlc.c | 2 +- libavcodec/h264_loopfilter.c | 2 +- libavcodec/h264_mvpred.h | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c81ba5e797..c350f492bd 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3932,7 +3932,7 @@ static int fill_filter_caches(H264Context *h, int mb_type) /* CAVLC 8x8dct requires NNZ values for residual decoding that differ * from what the loop filter needs */ - if (!CABAC && h->pps.transform_8x8_mode) { + if (!CABAC(h) && h->pps.transform_8x8_mode) { if (IS_8x8DCT(top_type)) { nnz_cache[4 + 8 * 0] = nnz_cache[5 + 8 * 0] = (h->cbp_table[top_xy] & 0x4000) >> 12; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7218cb7d27..1ea788d370 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -82,7 +82,7 @@ #define FIELD_OR_MBAFF_PICTURE(h) (FRAME_MBAFF(h) || FIELD_PICTURE(h)) #ifndef CABAC -#define CABAC h->pps.cabac +#define CABAC(h) h->pps.cabac #endif #define CHROMA422 (h->sps.chroma_format_idc == 2) @@ -884,7 +884,7 @@ static av_always_inline void write_back_motion_list(H264Context *h, AV_COPY128(mv_dst + 1 * b_stride, mv_src + 8 * 1); AV_COPY128(mv_dst + 2 * b_stride, mv_src + 8 * 2); AV_COPY128(mv_dst + 3 * b_stride, mv_src + 8 * 3); - if (CABAC) { + if (CABAC(h)) { uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? 8 * h->mb_xy : h->mb2br_xy[h->mb_xy]]; uint8_t(*mvd_src)[2] = &h->mvd_cache[list][scan8[0]]; @@ -923,7 +923,7 @@ static av_always_inline void write_back_motion(H264Context *h, int mb_type) if (USES_LIST(mb_type, 1)) write_back_motion_list(h, b_stride, b_xy, b8_xy, mb_type, 1); - if (h->slice_type_nos == AV_PICTURE_TYPE_B && CABAC) { + if (h->slice_type_nos == AV_PICTURE_TYPE_B && CABAC(h)) { if (IS_8X8(mb_type)) { uint8_t *direct_table = &h->direct_table[4 * h->mb_xy]; direct_table[1] = h->sub_mb_type[1] >> 1; diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 8cd60dcf23..ece7bbcfe0 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer */ -#define CABAC 1 +#define CABAC(h) 1 #include "config.h" #include "cabac.h" @@ -2303,7 +2303,7 @@ decode_intra_mb: } } if (h->top_type && !IS_8x8DCT(h->top_type)){ - uint32_t top_empty = CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040; + uint32_t top_empty = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 0x40404040; AV_WN32A(&nnz_cache[4+8* 0], top_empty); AV_WN32A(&nnz_cache[4+8* 5], top_empty); AV_WN32A(&nnz_cache[4+8*10], top_empty); diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index b18c54eed1..4f4637334c 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer */ -#define CABAC 0 +#define CABAC(h) 0 #include "internal.h" #include "avcodec.h" diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index bd1cf9c0d6..7b52236f2d 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -500,7 +500,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u if (IS_INTRA(mb_type | h->cur_pic.mb_type[mbn_xy])) { AV_WN64A(bS, 0x0003000300030003ULL); } else { - if (!CABAC && IS_8x8DCT(h->cur_pic.mb_type[mbn_xy])) { + if (!CABAC(h) && IS_8x8DCT(h->cur_pic.mb_type[mbn_xy])) { bS[0]= 1+((h->cbp_table[mbn_xy] & 0x4000)||h->non_zero_count_cache[scan8[0]+0]); bS[1]= 1+((h->cbp_table[mbn_xy] & 0x4000)||h->non_zero_count_cache[scan8[0]+1]); bS[2]= 1+((h->cbp_table[mbn_xy] & 0x8000)||h->non_zero_count_cache[scan8[0]+2]); diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index e87340c142..1fb56f5b3b 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -545,7 +545,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) AV_COPY32(&nnz_cache[4 + 8 * 10], &nnz[4 * 9]); } } else { - uint32_t top_empty = CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040; + uint32_t top_empty = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 0x40404040; AV_WN32A(&nnz_cache[4 + 8 * 0], top_empty); AV_WN32A(&nnz_cache[4 + 8 * 5], top_empty); AV_WN32A(&nnz_cache[4 + 8 * 10], top_empty); @@ -576,11 +576,11 @@ static void fill_decode_caches(H264Context *h, int mb_type) nnz_cache[3 + 8 * 6 + 2 * 8 * i] = nnz_cache[3 + 8 * 7 + 2 * 8 * i] = nnz_cache[3 + 8 * 11 + 2 * 8 * i] = - nnz_cache[3 + 8 * 12 + 2 * 8 * i] = CABAC && !IS_INTRA(mb_type) ? 0 : 64; + nnz_cache[3 + 8 * 12 + 2 * 8 * i] = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 64; } } - if (CABAC) { + if (CABAC(h)) { // top_cbp if (top_type) h->top_cbp = h->cbp_table[top_xy]; @@ -689,7 +689,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) AV_ZERO32(mv_cache[2 + 8 * 0]); AV_ZERO32(mv_cache[2 + 8 * 2]); - if (CABAC) { + if (CABAC(h)) { if (USES_LIST(top_type, list)) { const int b_xy = h->mb2br_xy[top_xy]; AV_COPY64(mvd_cache[0 - 1 * 8], mvd[b_xy + 0]);