diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 12:45:28 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 12:45:28 +0100 |
commit | bc66451e5e903698ee0500faf04c1214f3dd157f (patch) | |
tree | 4c9413f9161f50440fd102de9f40bd3f06fa2bfa /libavcodec/h264_slice.c | |
parent | 9d1fb9ef313e0fb709ac4c35c7bf00264963fd85 (diff) | |
parent | 741b494fa8cd28a7d096349bac183893c236e3f9 (diff) |
Merge commit '741b494fa8cd28a7d096349bac183893c236e3f9'
* commit '741b494fa8cd28a7d096349bac183893c236e3f9':
h264: eliminate default_ref_list
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r-- | libavcodec/h264_slice.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index bbadfc95bc..1639559832 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -540,10 +540,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->dequant_coeff_pps = h1->dequant_coeff_pps; // POC timing - copy_fields(h, h1, poc_lsb, default_ref_list); - - // reference lists - copy_fields(h, h1, short_ref, current_slice); + copy_fields(h, h1, poc_lsb, current_slice); copy_picture_range(h->short_ref, h1->short_ref, 32, h, h1); copy_picture_range(h->long_ref, h1->long_ref, 32, h, h1); @@ -1228,7 +1225,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) sl->slice_type_fixed = 0; slice_type = golomb_to_pict_type[slice_type]; - sl->slice_type = slice_type; sl->slice_type_nos = slice_type & 3; @@ -1667,7 +1663,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) memset(h->slice_table, -1, (h->mb_height * h->mb_stride - 1) * sizeof(*h->slice_table)); } - h->last_slice_type = -1; } if (!h->setup_finished) @@ -1734,14 +1729,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (ret < 0) return ret; - if (slice_type != AV_PICTURE_TYPE_I && - (h->current_slice == 0 || - slice_type != h->last_slice_type || - memcmp(h->last_ref_count, sl->ref_count, sizeof(sl->ref_count)))) { - - 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, sl); if (ret < 0) { @@ -1885,8 +1872,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) h->pps.chroma_qp_index_offset[1]) + 6 * (h->sps.bit_depth_luma - 8); - h->last_slice_type = slice_type; - memcpy(h->last_ref_count, sl->ref_count, sizeof(h->last_ref_count)); sl->slice_num = ++h->current_slice; if (sl->slice_num) |