diff options
author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
commit | 95eb35f30513e335990ad0d5dca6ddc318477291 (patch) | |
tree | 468c7a537fd11445da96dcaddac3736ab5ef28c9 /libavcodec/h264_slice.c | |
parent | 7747726667c86877feed30c9e18460cb8e63f551 (diff) | |
download | ffmpeg-streaming-95eb35f30513e335990ad0d5dca6ddc318477291.zip ffmpeg-streaming-95eb35f30513e335990ad0d5dca6ddc318477291.tar.gz |
h264: move the ref lists variables into the per-slice context
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r-- | libavcodec/h264_slice.c | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index e1ec578..67a8c85 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -834,20 +834,20 @@ static void implicit_weight_table(H264Context *h, H264SliceContext *sl, int fiel } else { cur_poc = h->cur_pic_ptr->field_poc[h->picture_structure - 1]; } - if (h->ref_count[0] == 1 && h->ref_count[1] == 1 && !FRAME_MBAFF(h) && - h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2 * cur_poc) { + if (sl->ref_count[0] == 1 && sl->ref_count[1] == 1 && !FRAME_MBAFF(h) && + sl->ref_list[0][0].poc + sl->ref_list[1][0].poc == 2 * cur_poc) { sl->use_weight = 0; sl->use_weight_chroma = 0; return; } ref_start = 0; - ref_count0 = h->ref_count[0]; - ref_count1 = h->ref_count[1]; + ref_count0 = sl->ref_count[0]; + ref_count1 = sl->ref_count[1]; } else { cur_poc = h->cur_pic_ptr->field_poc[field]; ref_start = 16; - ref_count0 = 16 + 2 * h->ref_count[0]; - ref_count1 = 16 + 2 * h->ref_count[1]; + ref_count0 = 16 + 2 * sl->ref_count[0]; + ref_count1 = 16 + 2 * sl->ref_count[1]; } sl->use_weight = 2; @@ -856,11 +856,11 @@ static void implicit_weight_table(H264Context *h, H264SliceContext *sl, int fiel sl->chroma_log2_weight_denom = 5; for (ref0 = ref_start; ref0 < ref_count0; ref0++) { - int poc0 = h->ref_list[0][ref0].poc; + int poc0 = sl->ref_list[0][ref0].poc; for (ref1 = ref_start; ref1 < ref_count1; ref1++) { int w = 32; - if (!h->ref_list[0][ref0].long_ref && !h->ref_list[1][ref1].long_ref) { - int poc1 = h->ref_list[1][ref1].poc; + if (!sl->ref_list[0][ref0].long_ref && !sl->ref_list[1][ref1].long_ref) { + int poc1 = sl->ref_list[1][ref1].poc; int td = av_clip_int8(poc1 - poc0); if (td) { int tb = av_clip_int8(cur_poc - poc0); @@ -1190,7 +1190,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex if (first_mb_in_slice == 0) { // FIXME better field boundary detection if (h0->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) { - ff_h264_field_end(h, 1); + ff_h264_field_end(h, sl, 1); } h0->current_slice = 0; @@ -1602,9 +1602,9 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex ff_h264_fill_default_ref_list(h, sl); if (sl->slice_type_nos != AV_PICTURE_TYPE_I) { - ret = ff_h264_decode_ref_pic_list_reordering(h); + ret = ff_h264_decode_ref_pic_list_reordering(h, sl); if (ret < 0) { - h->ref_count[1] = h->ref_count[0] = 0; + sl->ref_count[1] = sl->ref_count[0] = 0; return ret; } } @@ -1748,13 +1748,13 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex for (j = 0; j < 2; j++) { int id_list[16]; - int *ref2frm = h->ref2frm[sl->slice_num & (MAX_SLICES - 1)][j]; + int *ref2frm = sl->ref2frm[sl->slice_num & (MAX_SLICES - 1)][j]; for (i = 0; i < 16; i++) { id_list[i] = 60; - if (j < h->list_count && i < h->ref_count[j] && - h->ref_list[j][i].f.buf[0]) { + if (j < sl->list_count && i < sl->ref_count[j] && + sl->ref_list[j][i].f.buf[0]) { int k; - AVBuffer *buf = h->ref_list[j][i].f.buf[0]->buffer; + AVBuffer *buf = sl->ref_list[j][i].f.buf[0]->buffer; for (k = 0; k < h->short_ref_count; k++) if (h->short_ref[k]->f.buf[0]->buffer == buf) { id_list[i] = k; @@ -1771,12 +1771,12 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex ref2frm[0] = ref2frm[1] = -1; for (i = 0; i < 16; i++) - ref2frm[i + 2] = 4 * id_list[i] + (h->ref_list[j][i].reference & 3); + ref2frm[i + 2] = 4 * id_list[i] + (sl->ref_list[j][i].reference & 3); ref2frm[18 + 0] = ref2frm[18 + 1] = -1; for (i = 16; i < 48; i++) ref2frm[i + 4] = 4 * id_list[(i - 16) >> 1] + - (h->ref_list[j][i].reference & 3); + (sl->ref_list[j][i].reference & 3); } if (h->avctx->debug & FF_DEBUG_PICT_INFO) { @@ -1791,7 +1791,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex pps_id, h->frame_num, h->cur_pic_ptr->field_poc[0], h->cur_pic_ptr->field_poc[1], - h->ref_count[0], h->ref_count[1], + sl->ref_count[0], sl->ref_count[1], sl->qscale, h->deblocking_filter, h->slice_alpha_c0_offset, h->slice_beta_offset, @@ -1836,7 +1836,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h, if (USES_LIST(top_type, list)) { const int b_xy = h->mb2b_xy[top_xy] + 3 * b_stride; const int b8_xy = 4 * top_xy + 2; - int (*ref2frm)[64] = h->ref2frm[h->slice_table[top_xy] & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2); + int (*ref2frm)[64] = sl->ref2frm[h->slice_table[top_xy] & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2); AV_COPY128(mv_dst - 1 * 8, h->cur_pic.motion_val[list][b_xy + 0]); ref_cache[0 - 1 * 8] = ref_cache[1 - 1 * 8] = ref2frm[list][h->cur_pic.ref_index[list][b8_xy + 0]]; @@ -1851,7 +1851,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h, if (USES_LIST(left_type[LTOP], list)) { const int b_xy = h->mb2b_xy[left_xy[LTOP]] + 3; const int b8_xy = 4 * left_xy[LTOP] + 1; - int (*ref2frm)[64] = h->ref2frm[h->slice_table[left_xy[LTOP]] & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2); + int (*ref2frm)[64] = sl->ref2frm[h->slice_table[left_xy[LTOP]] & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2); AV_COPY32(mv_dst - 1 + 0, h->cur_pic.motion_val[list][b_xy + b_stride * 0]); AV_COPY32(mv_dst - 1 + 8, h->cur_pic.motion_val[list][b_xy + b_stride * 1]); AV_COPY32(mv_dst - 1 + 16, h->cur_pic.motion_val[list][b_xy + b_stride * 2]); @@ -1884,7 +1884,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h, { int8_t *ref = &h->cur_pic.ref_index[list][4 * mb_xy]; - int (*ref2frm)[64] = h->ref2frm[sl->slice_num & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2); + int (*ref2frm)[64] = sl->ref2frm[sl->slice_num & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2); uint32_t ref01 = (pack16to32(ref2frm[list][ref[0]], ref2frm[list][ref[1]]) & 0x00FF00FF) * 0x0101; uint32_t ref23 = (pack16to32(ref2frm[list][ref[2]], ref2frm[list][ref[3]]) & 0x00FF00FF) * 0x0101; AV_WN32A(&ref_cache[0 * 8], ref01); @@ -1982,7 +1982,7 @@ static int fill_filter_caches(H264Context *h, H264SliceContext *sl, int mb_type) fill_filter_caches_inter(h, sl, mb_type, top_xy, left_xy, top_type, left_type, mb_xy, 0); - if (h->list_count == 2) + if (sl->list_count == 2) fill_filter_caches_inter(h, sl, mb_type, top_xy, left_xy, top_type, left_type, mb_xy, 1); @@ -2067,7 +2067,7 @@ static void loop_filter(H264Context *h, H264SliceContext *sl, int start_x, int e mb_xy = h->mb_xy = mb_x + mb_y * h->mb_stride; sl->slice_num = h->slice_table[mb_xy]; mb_type = h->cur_pic.mb_type[mb_xy]; - h->list_count = h->list_counts[mb_xy]; + sl->list_count = h->list_counts[mb_xy]; if (FRAME_MBAFF(h)) h->mb_mbaff = @@ -2133,7 +2133,7 @@ static void predict_field_decoding_flag(H264Context *h, H264SliceContext *sl) /** * Draw edges and report progress for the last MB row. */ -static void decode_finish_row(H264Context *h) +static void decode_finish_row(H264Context *h, H264SliceContext *sl) { int top = 16 * (h->mb_y >> FIELD_PICTURE(h)); int pic_height = 16 * h->mb_height >> FIELD_PICTURE(h); @@ -2155,7 +2155,7 @@ static void decode_finish_row(H264Context *h) top = 0; } - ff_h264_draw_horiz_band(h, top, height); + ff_h264_draw_horiz_band(h, sl, top, height); if (h->droppable) return; @@ -2164,13 +2164,14 @@ static void decode_finish_row(H264Context *h) h->picture_structure == PICT_BOTTOM_FIELD); } -static void er_add_slice(H264Context *h, int startx, int starty, +static void er_add_slice(H264Context *h, H264SliceContext *sl, + int startx, int starty, int endx, int endy, int status) { #if CONFIG_ERROR_RESILIENCE ERContext *er = &h->er; - er->ref_count = h->ref_count[0]; + er->ref_count = sl->ref_count[0]; ff_er_add_slice(er, startx, starty, endx, endy, status); #endif } @@ -2221,7 +2222,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if ((h->workaround_bugs & FF_BUG_TRUNCATED) && h->cabac.bytestream > h->cabac.bytestream_end + 2) { - er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1, + er_add_slice(h, sl, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1, h->mb_y, ER_MB_END); if (h->mb_x >= lf_x_start) loop_filter(h, sl, lf_x_start, h->mb_x + 1); @@ -2232,7 +2233,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) "error while decoding MB %d %d, bytestream %td\n", h->mb_x, h->mb_y, h->cabac.bytestream_end - h->cabac.bytestream); - er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x, + er_add_slice(h, sl, h->resync_mb_x, h->resync_mb_y, h->mb_x, h->mb_y, ER_MB_ERROR); return AVERROR_INVALIDDATA; } @@ -2240,7 +2241,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (++h->mb_x >= h->mb_width) { loop_filter(h, sl, lf_x_start, h->mb_x); h->mb_x = lf_x_start = 0; - decode_finish_row(h); + decode_finish_row(h, sl); ++h->mb_y; if (FIELD_OR_MBAFF_PICTURE(h)) { ++h->mb_y; @@ -2252,7 +2253,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (eos || h->mb_y >= h->mb_height) { tprintf(h->avctx, "slice end %d %d\n", get_bits_count(&h->gb), h->gb.size_in_bits); - er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1, + er_add_slice(h, sl, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1, h->mb_y, ER_MB_END); if (h->mb_x > lf_x_start) loop_filter(h, sl, lf_x_start, h->mb_x); @@ -2279,7 +2280,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (ret < 0) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", h->mb_x, h->mb_y); - er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x, + er_add_slice(h, sl, h->resync_mb_x, h->resync_mb_y, h->mb_x, h->mb_y, ER_MB_ERROR); return ret; } @@ -2287,7 +2288,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (++h->mb_x >= h->mb_width) { loop_filter(h, sl, lf_x_start, h->mb_x); h->mb_x = lf_x_start = 0; - decode_finish_row(h); + decode_finish_row(h, sl); ++h->mb_y; if (FIELD_OR_MBAFF_PICTURE(h)) { ++h->mb_y; @@ -2299,12 +2300,12 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) get_bits_count(&h->gb), h->gb.size_in_bits); if (get_bits_left(&h->gb) == 0) { - er_add_slice(h, h->resync_mb_x, h->resync_mb_y, + er_add_slice(h, sl, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1, h->mb_y, ER_MB_END); return 0; } else { - er_add_slice(h, h->resync_mb_x, h->resync_mb_y, + er_add_slice(h, sl, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1, h->mb_y, ER_MB_END); return AVERROR_INVALIDDATA; @@ -2317,14 +2318,14 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) get_bits_count(&h->gb), h->gb.size_in_bits); if (get_bits_left(&h->gb) == 0) { - er_add_slice(h, h->resync_mb_x, h->resync_mb_y, + er_add_slice(h, sl, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1, h->mb_y, ER_MB_END); if (h->mb_x > lf_x_start) loop_filter(h, sl, lf_x_start, h->mb_x); return 0; } else { - er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x, + er_add_slice(h, sl, h->resync_mb_x, h->resync_mb_y, h->mb_x, h->mb_y, ER_MB_ERROR); return AVERROR_INVALIDDATA; |