June 2016 - ffmpeg-cvslog - lists.ffmpeg.org

h264: move building the reference list out of h264_slice_header_parse()
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Apr 14 20:53:59 2016 +0200| [6dd996c7c81575a1e4969987ab175a6df7beab3d] | committer: Anton Khirnov h264: move building the reference list out of h264_slice_header_parse() This does not do any bitstream parsing and will allow moving out other code in later commits. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dd996c7c81575a1e… --- libavcodec/h264_slice.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2e95879..0c38121 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1347,9 +1347,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) sl->ref_count[1] = sl->ref_count[0] = 0; return ret; } - ret = ff_h264_build_ref_list(h, sl); - if (ret < 0) - return ret; } sl->pwt.use_weight = 0; @@ -1449,6 +1446,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (ret < 0) return ret; + ret = ff_h264_build_ref_list(h, sl); + if (ret < 0) + return ret; + if (h->ps.pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { implicit_weight_table(h, sl, -1);

1 0

h264: move initing the implicit pred weight table out of h264_slice_header_parse ()
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Apr 14 20:53:59 2016 +0200| [0bad254300356005af4aef00a706bf2e8eee96bc] | committer: Anton Khirnov h264: move initing the implicit pred weight table out of h264_slice_header_parse() It depends on the reference list, so this will allow moving out the reference list construction and consequently other code it depends on. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bad254300356005a… --- libavcodec/h264_slice.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index b84514c..2e95879 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1352,25 +1352,16 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) return ret; } + sl->pwt.use_weight = 0; + for (i = 0; i < 2; i++) { + sl->pwt.luma_weight_flag[i] = 0; + sl->pwt.chroma_weight_flag[i] = 0; + } if ((pps->weighted_pred && sl->slice_type_nos == AV_PICTURE_TYPE_P) || (pps->weighted_bipred_idc == 1 && sl->slice_type_nos == AV_PICTURE_TYPE_B)) ff_h264_pred_weight_table(&sl->gb, sps, sl->ref_count, sl->slice_type_nos, &sl->pwt); - else if (pps->weighted_bipred_idc == 2 && - sl->slice_type_nos == AV_PICTURE_TYPE_B) { - implicit_weight_table(h, sl, -1); - if (FRAME_MBAFF(h)) { - implicit_weight_table(h, sl, 0); - implicit_weight_table(h, sl, 1); - } - } else { - sl->pwt.use_weight = 0; - for (i = 0; i < 2; i++) { - sl->pwt.luma_weight_flag[i] = 0; - sl->pwt.chroma_weight_flag[i] = 0; - } - } // If frame-mt is enabled, only update mmco tables for the first slice // in a field. Subsequent slices can temporarily clobber h->mmco_index @@ -1458,6 +1449,15 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (ret < 0) return ret; + if (h->ps.pps->weighted_bipred_idc == 2 && + sl->slice_type_nos == AV_PICTURE_TYPE_B) { + implicit_weight_table(h, sl, -1); + if (FRAME_MBAFF(h)) { + implicit_weight_table(h, sl, 0); + implicit_weight_table(h, sl, 1); + } + } + if (sl->slice_type_nos == AV_PICTURE_TYPE_B && !sl->direct_spatial_mv_pred) ff_h264_direct_dist_scale_factor(h, sl); ff_h264_direct_ref_list_init(h, sl);

1 0

Merge commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c' into merge-libav-new
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 17:31:44 2016 +0200| [2aff557c6acbce2b2b604c6c620c66c892260062] | committer: Clément Bœsch Merge commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c' into merge-libav-new * commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c': h264: split reading the ref list modifications and actually building the ref list ref_modifications.val are read as u32 instead of u8 in FFmpeg. Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2aff557c6acbce2b2… --- libavcodec/h264.h | 8 +- libavcodec/h264_refs.c | 197 ++++++++++++++++++++++++++--------------------- libavcodec/h264_slice.c | 3 + 3 files changed, 119 insertions(+), 89 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 50fd45a..2544e9d 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -406,6 +406,11 @@ typedef struct H264SliceContext { H264Ref ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs. * Reordered version of default_ref_list * according to picture reordering in slice header */ + struct { + uint8_t op; + uint32_t val; + } ref_modifications[2][32]; + int nb_ref_modifications[2]; const uint8_t *intra_pcm_ptr; int16_t *dc_val_base; @@ -714,7 +719,8 @@ int ff_h264_get_slice_type(const H264SliceContext *sl); */ int ff_h264_alloc_tables(H264Context *h); -int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl); +int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl); +int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 15957a3..c7676c4 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -295,7 +295,7 @@ static void h264_fill_mbaff_ref_list(H264SliceContext *sl) } } -int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) +int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl) { int list, index, pic_structure; @@ -305,102 +305,88 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) h264_initialise_ref_list(h, sl); for (list = 0; list < sl->list_count; list++) { - if (get_bits1(&sl->gb)) { // ref_pic_list_modification_flag_l[01] - int pred = h->curr_pic_num; - - for (index = 0; ; index++) { - unsigned int modification_of_pic_nums_idc = get_ue_golomb_31(&sl->gb); - unsigned int pic_id; - int i; - H264Picture *ref = NULL; - - if (modification_of_pic_nums_idc == 3) - break; - - if (index >= sl->ref_count[list]) { - av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n"); - return -1; + int pred = h->curr_pic_num; + + for (index = 0; index < sl->nb_ref_modifications[list]; index++) { + unsigned int modification_of_pic_nums_idc = sl->ref_modifications[list][index].op; + unsigned int val = sl->ref_modifications[list][index].val; + unsigned int pic_id; + int i; + H264Picture *ref = NULL; + + switch (modification_of_pic_nums_idc) { + case 0: + case 1: { + const unsigned int abs_diff_pic_num = val + 1; + int frame_num; + + if (abs_diff_pic_num > h->max_pic_num) { + av_log(h->avctx, AV_LOG_ERROR, + "abs_diff_pic_num overflow\n"); + return AVERROR_INVALIDDATA; } - switch (modification_of_pic_nums_idc) { - case 0: - case 1: { - const unsigned int abs_diff_pic_num = get_ue_golomb_long(&sl->gb) + 1; - int frame_num; - - if (abs_diff_pic_num > h->max_pic_num) { - av_log(h->avctx, AV_LOG_ERROR, - "abs_diff_pic_num overflow\n"); - return AVERROR_INVALIDDATA; - } - - if (modification_of_pic_nums_idc == 0) - pred -= abs_diff_pic_num; - else - pred += abs_diff_pic_num; - pred &= h->max_pic_num - 1; - - frame_num = pic_num_extract(h, pred, &pic_structure); - - for (i = h->short_ref_count - 1; i >= 0; i--) { - ref = h->short_ref[i]; - assert(ref->reference); - assert(!ref->long_ref); - if (ref->frame_num == frame_num && - (ref->reference & pic_structure)) - break; - } - if (i >= 0) - ref->pic_id = pred; - break; + if (modification_of_pic_nums_idc == 0) + pred -= abs_diff_pic_num; + else + pred += abs_diff_pic_num; + pred &= h->max_pic_num - 1; + + frame_num = pic_num_extract(h, pred, &pic_structure); + + for (i = h->short_ref_count - 1; i >= 0; i--) { + ref = h->short_ref[i]; + assert(ref->reference); + assert(!ref->long_ref); + if (ref->frame_num == frame_num && + (ref->reference & pic_structure)) + break; } - case 2: { - int long_idx; - pic_id = get_ue_golomb(&sl->gb); // long_term_pic_idx + if (i >= 0) + ref->pic_id = pred; + break; + } + case 2: { + int long_idx; + pic_id = val; // long_term_pic_idx - long_idx = pic_num_extract(h, pic_id, &pic_structure); + long_idx = pic_num_extract(h, pic_id, &pic_structure); - if (long_idx > 31U) { - av_log(h->avctx, AV_LOG_ERROR, - "long_term_pic_idx overflow\n"); - return AVERROR_INVALIDDATA; - } - ref = h->long_ref[long_idx]; - assert(!(ref && !ref->reference)); - if (ref && (ref->reference & pic_structure) && !mismatches_ref(h, ref)) { - ref->pic_id = pic_id; - assert(ref->long_ref); - i = 0; - } else { - i = -1; - } - break; - } - default: + if (long_idx > 31U) { av_log(h->avctx, AV_LOG_ERROR, - "illegal modification_of_pic_nums_idc %u\n", - modification_of_pic_nums_idc); + "long_term_pic_idx overflow\n"); return AVERROR_INVALIDDATA; } - - if (i < 0) { - av_log(h->avctx, AV_LOG_ERROR, - "reference picture missing during reorder\n"); - memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME + ref = h->long_ref[long_idx]; + assert(!(ref && !ref->reference)); + if (ref && (ref->reference & pic_structure)) { + ref->pic_id = pic_id; + assert(ref->long_ref); + i = 0; } else { - for (i = index; i + 1 < sl->ref_count[list]; i++) { - if (sl->ref_list[list][i].parent && - ref->long_ref == sl->ref_list[list][i].parent->long_ref && - ref->pic_id == sl->ref_list[list][i].pic_id) - break; - } - for (; i > index; i--) { - sl->ref_list[list][i] = sl->ref_list[list][i - 1]; - } - ref_from_h264pic(&sl->ref_list[list][index], ref); - if (FIELD_PICTURE(h)) { - pic_as_field(&sl->ref_list[list][index], pic_structure); - } + i = -1; + } + break; + } + } + + if (i < 0) { + av_log(h->avctx, AV_LOG_ERROR, + "reference picture missing during reorder\n"); + memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME + } else { + for (i = index; i + 1 < sl->ref_count[list]; i++) { + if (sl->ref_list[list][i].parent && + ref->long_ref == sl->ref_list[list][i].parent->long_ref && + ref->pic_id == sl->ref_list[list][i].pic_id) + break; + } + for (; i > index; i--) { + sl->ref_list[list][i] = sl->ref_list[list][i - 1]; + } + ref_from_h264pic(&sl->ref_list[list][index], ref); + if (FIELD_PICTURE(h)) { + pic_as_field(&sl->ref_list[list][index], pic_structure); } } } @@ -429,6 +415,41 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) return 0; } +int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl) +{ + int list, index; + + sl->nb_ref_modifications[0] = 0; + sl->nb_ref_modifications[1] = 0; + + for (list = 0; list < sl->list_count; list++) { + if (!get_bits1(&sl->gb)) // ref_pic_list_modification_flag_l[01] + continue; + + for (index = 0; ; index++) { + unsigned int op = get_ue_golomb_31(&sl->gb); + + if (op == 3) + break; + + if (index >= sl->ref_count[list]) { + av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n"); + return AVERROR_INVALIDDATA; + } else if (op > 2) { + av_log(h->avctx, AV_LOG_ERROR, + "illegal modification_of_pic_nums_idc %u\n", + op); + return AVERROR_INVALIDDATA; + } + sl->ref_modifications[list][index].val = get_ue_golomb_long(&sl->gb); + sl->ref_modifications[list][index].op = op; + sl->nb_ref_modifications[list]++; + } + } + + return 0; +} + /** * Mark a picture as no longer needed for reference. The refmask * argument allows unreferencing of individual fields or the whole frame. diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 0c36c8f..5cfb34f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1597,6 +1597,9 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) sl->ref_count[1] = sl->ref_count[0] = 0; return ret; } + ret = ff_h264_build_ref_list(h, sl); + if (ret < 0) + return ret; } if ((pps->weighted_pred && sl->slice_type_nos == AV_PICTURE_TYPE_P) || ====================================================================== diff --cc libavcodec/h264.h index 50fd45a,b4e5f3a..2544e9d --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@@ -406,6 -391,11 +406,11 @@@ typedef struct H264SliceContext H264Ref ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs. * Reordered version of default_ref_list * according to picture reordering in slice header */ + struct { + uint8_t op; - uint8_t val; ++ uint32_t val; + } ref_modifications[2][32]; + int nb_ref_modifications[2]; const uint8_t *intra_pcm_ptr; int16_t *dc_val_base; @@@ -714,7 -661,8 +719,8 @@@ int ff_h264_get_slice_type(const H264Sl */ int ff_h264_alloc_tables(H264Context *h); - int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl); + int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl); -int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl); ++int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** diff --cc libavcodec/h264_refs.c index 15957a3,ce3806c..c7676c4 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@@ -295,7 -252,7 +295,7 @@@ static void h264_fill_mbaff_ref_list(H2 } } - int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) -int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl) ++int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl) { int list, index, pic_structure; @@@ -305,102 -262,88 +305,88 @@@ h264_initialise_ref_list(h, sl); for (list = 0; list < sl->list_count; list++) { - if (get_bits1(&sl->gb)) { // ref_pic_list_modification_flag_l[01] - int pred = h->curr_pic_num; - - for (index = 0; ; index++) { - unsigned int modification_of_pic_nums_idc = get_ue_golomb_31(&sl->gb); - unsigned int pic_id; - int i; - H264Picture *ref = NULL; - - if (modification_of_pic_nums_idc == 3) - break; - - if (index >= sl->ref_count[list]) { - av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n"); - return -1; + int pred = h->curr_pic_num; + + for (index = 0; index < sl->nb_ref_modifications[list]; index++) { + unsigned int modification_of_pic_nums_idc = sl->ref_modifications[list][index].op; + unsigned int val = sl->ref_modifications[list][index].val; + unsigned int pic_id; + int i; + H264Picture *ref = NULL; + + switch (modification_of_pic_nums_idc) { + case 0: + case 1: { + const unsigned int abs_diff_pic_num = val + 1; + int frame_num; + + if (abs_diff_pic_num > h->max_pic_num) { + av_log(h->avctx, AV_LOG_ERROR, + "abs_diff_pic_num overflow\n"); + return AVERROR_INVALIDDATA; } - switch (modification_of_pic_nums_idc) { - case 0: - case 1: { - const unsigned int abs_diff_pic_num = get_ue_golomb_long(&sl->gb) + 1; - int frame_num; - - if (abs_diff_pic_num > h->max_pic_num) { - av_log(h->avctx, AV_LOG_ERROR, - "abs_diff_pic_num overflow\n"); - return AVERROR_INVALIDDATA; - } - - if (modification_of_pic_nums_idc == 0) - pred -= abs_diff_pic_num; - else - pred += abs_diff_pic_num; - pred &= h->max_pic_num - 1; - - frame_num = pic_num_extract(h, pred, &pic_structure); - - for (i = h->short_ref_count - 1; i >= 0; i--) { - ref = h->short_ref[i]; - assert(ref->reference); - assert(!ref->long_ref); - if (ref->frame_num == frame_num && - (ref->reference & pic_structure)) - break; - } - if (i >= 0) - ref->pic_id = pred; - break; - } - case 2: { - int long_idx; - pic_id = get_ue_golomb(&sl->gb); // long_term_pic_idx - - long_idx = pic_num_extract(h, pic_id, &pic_structure); - - if (long_idx > 31U) { - av_log(h->avctx, AV_LOG_ERROR, - "long_term_pic_idx overflow\n"); - return AVERROR_INVALIDDATA; - } - ref = h->long_ref[long_idx]; - assert(!(ref && !ref->reference)); - if (ref && (ref->reference & pic_structure) && !mismatches_ref(h, ref)) { - ref->pic_id = pic_id; - assert(ref->long_ref); - i = 0; - } else { - i = -1; - } - break; + if (modification_of_pic_nums_idc == 0) + pred -= abs_diff_pic_num; + else + pred += abs_diff_pic_num; + pred &= h->max_pic_num - 1; + + frame_num = pic_num_extract(h, pred, &pic_structure); + + for (i = h->short_ref_count - 1; i >= 0; i--) { + ref = h->short_ref[i]; + assert(ref->reference); + assert(!ref->long_ref); + if (ref->frame_num == frame_num && + (ref->reference & pic_structure)) + break; } - default: + if (i >= 0) + ref->pic_id = pred; + break; + } + case 2: { + int long_idx; + pic_id = val; // long_term_pic_idx + + long_idx = pic_num_extract(h, pic_id, &pic_structure); + - if (long_idx > 31) { ++ if (long_idx > 31U) { av_log(h->avctx, AV_LOG_ERROR, - "illegal modification_of_pic_nums_idc %u\n", - modification_of_pic_nums_idc); + "long_term_pic_idx overflow\n"); return AVERROR_INVALIDDATA; } - - if (i < 0) { - av_log(h->avctx, AV_LOG_ERROR, - "reference picture missing during reorder\n"); - memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME + ref = h->long_ref[long_idx]; + assert(!(ref && !ref->reference)); + if (ref && (ref->reference & pic_structure)) { + ref->pic_id = pic_id; + assert(ref->long_ref); + i = 0; } else { - for (i = index; i + 1 < sl->ref_count[list]; i++) { - if (sl->ref_list[list][i].parent && - ref->long_ref == sl->ref_list[list][i].parent->long_ref && - ref->pic_id == sl->ref_list[list][i].pic_id) - break; - } - for (; i > index; i--) { - sl->ref_list[list][i] = sl->ref_list[list][i - 1]; - } - ref_from_h264pic(&sl->ref_list[list][index], ref); - if (FIELD_PICTURE(h)) { - pic_as_field(&sl->ref_list[list][index], pic_structure); - } + i = -1; + } + break; + } + } + + if (i < 0) { + av_log(h->avctx, AV_LOG_ERROR, + "reference picture missing during reorder\n"); + memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME + } else { + for (i = index; i + 1 < sl->ref_count[list]; i++) { + if (sl->ref_list[list][i].parent && + ref->long_ref == sl->ref_list[list][i].parent->long_ref && + ref->pic_id == sl->ref_list[list][i].pic_id) + break; + } + for (; i > index; i--) { + sl->ref_list[list][i] = sl->ref_list[list][i - 1]; + } + ref_from_h264pic(&sl->ref_list[list][index], ref); + if (FIELD_PICTURE(h)) { + pic_as_field(&sl->ref_list[list][index], pic_structure); } } } @@@ -429,6 -366,41 +415,41 @@@ return 0; } + int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl) + { + int list, index; + + sl->nb_ref_modifications[0] = 0; + sl->nb_ref_modifications[1] = 0; + + for (list = 0; list < sl->list_count; list++) { + if (!get_bits1(&sl->gb)) // ref_pic_list_modification_flag_l[01] + continue; + + for (index = 0; ; index++) { + unsigned int op = get_ue_golomb_31(&sl->gb); + + if (op == 3) + break; + + if (index >= sl->ref_count[list]) { + av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n"); + return AVERROR_INVALIDDATA; + } else if (op > 2) { + av_log(h->avctx, AV_LOG_ERROR, + "illegal modification_of_pic_nums_idc %u\n", + op); + return AVERROR_INVALIDDATA; + } - sl->ref_modifications[list][index].val = get_ue_golomb(&sl->gb); ++ sl->ref_modifications[list][index].val = get_ue_golomb_long(&sl->gb); + sl->ref_modifications[list][index].op = op; + sl->nb_ref_modifications[list]++; + } + } + + return 0; + } + /** * Mark a picture as no longer needed for reference. The refmask * argument allows unreferencing of individual fields or the whole frame.

1 0

h264: split reading the ref list modifications and actually building the ref list
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Apr 15 16:10:21 2016 +0200| [ed9a20ebe4a89de119ea97bdccf688ece8c6648c] | committer: Anton Khirnov h264: split reading the ref list modifications and actually building the ref list This will allow postponing the reference list construction (and by consequence some other functions, like frame_start) until the whole slice header has been parsed. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed9a20ebe4a89de11… --- libavcodec/h264.h | 6 ++ libavcodec/h264_refs.c | 197 ++++++++++++++++++++++++++--------------------- libavcodec/h264_slice.c | 3 + 3 files changed, 118 insertions(+), 88 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 034507d..b4e5f3a 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -391,6 +391,11 @@ typedef struct H264SliceContext { H264Ref ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs. * Reordered version of default_ref_list * according to picture reordering in slice header */ + struct { + uint8_t op; + uint8_t val; + } ref_modifications[2][32]; + int nb_ref_modifications[2]; const uint8_t *intra_pcm_ptr; int16_t *dc_val_base; @@ -657,6 +662,7 @@ int ff_h264_get_slice_type(const H264SliceContext *sl); int ff_h264_alloc_tables(H264Context *h); int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl); +int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index b4dfbbc..ce3806c 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -252,7 +252,7 @@ static void h264_fill_mbaff_ref_list(H264SliceContext *sl) } } -int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl) +int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl) { int list, index, pic_structure; @@ -262,102 +262,88 @@ int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContex h264_initialise_ref_list(h, sl); for (list = 0; list < sl->list_count; list++) { - if (get_bits1(&sl->gb)) { // ref_pic_list_modification_flag_l[01] - int pred = h->curr_pic_num; - - for (index = 0; ; index++) { - unsigned int modification_of_pic_nums_idc = get_ue_golomb_31(&sl->gb); - unsigned int pic_id; - int i; - H264Picture *ref = NULL; - - if (modification_of_pic_nums_idc == 3) - break; - - if (index >= sl->ref_count[list]) { - av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n"); - return -1; + int pred = h->curr_pic_num; + + for (index = 0; index < sl->nb_ref_modifications[list]; index++) { + unsigned int modification_of_pic_nums_idc = sl->ref_modifications[list][index].op; + unsigned int val = sl->ref_modifications[list][index].val; + unsigned int pic_id; + int i; + H264Picture *ref = NULL; + + switch (modification_of_pic_nums_idc) { + case 0: + case 1: { + const unsigned int abs_diff_pic_num = val + 1; + int frame_num; + + if (abs_diff_pic_num > h->max_pic_num) { + av_log(h->avctx, AV_LOG_ERROR, + "abs_diff_pic_num overflow\n"); + return AVERROR_INVALIDDATA; } - switch (modification_of_pic_nums_idc) { - case 0: - case 1: { - const unsigned int abs_diff_pic_num = get_ue_golomb(&sl->gb) + 1; - int frame_num; - - if (abs_diff_pic_num > h->max_pic_num) { - av_log(h->avctx, AV_LOG_ERROR, - "abs_diff_pic_num overflow\n"); - return AVERROR_INVALIDDATA; - } - - if (modification_of_pic_nums_idc == 0) - pred -= abs_diff_pic_num; - else - pred += abs_diff_pic_num; - pred &= h->max_pic_num - 1; - - frame_num = pic_num_extract(h, pred, &pic_structure); - - for (i = h->short_ref_count - 1; i >= 0; i--) { - ref = h->short_ref[i]; - assert(ref->reference); - assert(!ref->long_ref); - if (ref->frame_num == frame_num && - (ref->reference & pic_structure)) - break; - } - if (i >= 0) - ref->pic_id = pred; - break; + if (modification_of_pic_nums_idc == 0) + pred -= abs_diff_pic_num; + else + pred += abs_diff_pic_num; + pred &= h->max_pic_num - 1; + + frame_num = pic_num_extract(h, pred, &pic_structure); + + for (i = h->short_ref_count - 1; i >= 0; i--) { + ref = h->short_ref[i]; + assert(ref->reference); + assert(!ref->long_ref); + if (ref->frame_num == frame_num && + (ref->reference & pic_structure)) + break; } - case 2: { - int long_idx; - pic_id = get_ue_golomb(&sl->gb); // long_term_pic_idx + if (i >= 0) + ref->pic_id = pred; + break; + } + case 2: { + int long_idx; + pic_id = val; // long_term_pic_idx - long_idx = pic_num_extract(h, pic_id, &pic_structure); + long_idx = pic_num_extract(h, pic_id, &pic_structure); - if (long_idx > 31) { - av_log(h->avctx, AV_LOG_ERROR, - "long_term_pic_idx overflow\n"); - return AVERROR_INVALIDDATA; - } - ref = h->long_ref[long_idx]; - assert(!(ref && !ref->reference)); - if (ref && (ref->reference & pic_structure)) { - ref->pic_id = pic_id; - assert(ref->long_ref); - i = 0; - } else { - i = -1; - } - break; - } - default: + if (long_idx > 31) { av_log(h->avctx, AV_LOG_ERROR, - "illegal modification_of_pic_nums_idc %u\n", - modification_of_pic_nums_idc); + "long_term_pic_idx overflow\n"); return AVERROR_INVALIDDATA; } - - if (i < 0) { - av_log(h->avctx, AV_LOG_ERROR, - "reference picture missing during reorder\n"); - memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME + ref = h->long_ref[long_idx]; + assert(!(ref && !ref->reference)); + if (ref && (ref->reference & pic_structure)) { + ref->pic_id = pic_id; + assert(ref->long_ref); + i = 0; } else { - for (i = index; i + 1 < sl->ref_count[list]; i++) { - if (sl->ref_list[list][i].parent && - ref->long_ref == sl->ref_list[list][i].parent->long_ref && - ref->pic_id == sl->ref_list[list][i].pic_id) - break; - } - for (; i > index; i--) { - sl->ref_list[list][i] = sl->ref_list[list][i - 1]; - } - ref_from_h264pic(&sl->ref_list[list][index], ref); - if (FIELD_PICTURE(h)) { - pic_as_field(&sl->ref_list[list][index], pic_structure); - } + i = -1; + } + break; + } + } + + if (i < 0) { + av_log(h->avctx, AV_LOG_ERROR, + "reference picture missing during reorder\n"); + memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME + } else { + for (i = index; i + 1 < sl->ref_count[list]; i++) { + if (sl->ref_list[list][i].parent && + ref->long_ref == sl->ref_list[list][i].parent->long_ref && + ref->pic_id == sl->ref_list[list][i].pic_id) + break; + } + for (; i > index; i--) { + sl->ref_list[list][i] = sl->ref_list[list][i - 1]; + } + ref_from_h264pic(&sl->ref_list[list][index], ref); + if (FIELD_PICTURE(h)) { + pic_as_field(&sl->ref_list[list][index], pic_structure); } } } @@ -380,6 +366,41 @@ int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContex return 0; } +int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl) +{ + int list, index; + + sl->nb_ref_modifications[0] = 0; + sl->nb_ref_modifications[1] = 0; + + for (list = 0; list < sl->list_count; list++) { + if (!get_bits1(&sl->gb)) // ref_pic_list_modification_flag_l[01] + continue; + + for (index = 0; ; index++) { + unsigned int op = get_ue_golomb_31(&sl->gb); + + if (op == 3) + break; + + if (index >= sl->ref_count[list]) { + av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n"); + return AVERROR_INVALIDDATA; + } else if (op > 2) { + av_log(h->avctx, AV_LOG_ERROR, + "illegal modification_of_pic_nums_idc %u\n", + op); + return AVERROR_INVALIDDATA; + } + sl->ref_modifications[list][index].val = get_ue_golomb(&sl->gb); + sl->ref_modifications[list][index].op = op; + sl->nb_ref_modifications[list]++; + } + } + + return 0; +} + /** * Mark a picture as no longer needed for reference. The refmask * argument allows unreferencing of individual fields or the whole frame. diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 031f8cc..b84514c 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1347,6 +1347,9 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) sl->ref_count[1] = sl->ref_count[0] = 0; return ret; } + ret = ff_h264_build_ref_list(h, sl); + if (ret < 0) + return ret; } if ((pps->weighted_pred && sl->slice_type_nos == AV_PICTURE_TYPE_P) ||

1 0

fate/h264: add test for skip-nointra and skip-nokey
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Jun 3 03:38:12 2016 +0200| [89cccfc905f7fdd94a9c2c099f01790441f71ce0] | committer: Michael Niedermayer fate/h264: add test for skip-nointra and skip-nokey > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89cccfc905f7fdd94… --- tests/fate/h264.mak | 3 +++ tests/ref/fate/h264-skip-nointra | 54 ++++++++++++++++++++++++++++++++++++++ tests/ref/fate/h264-skip-nokey | 54 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 4ae1305..9b388bb 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -209,6 +209,7 @@ FATE_H264-$(call DEMDEC, MATROSKA, H264) += fate-h264-direct-bff FATE_H264-$(call DEMDEC, FLV, H264) += fate-h264-brokensps-2580 FATE_H264-$(call DEMDEC, MXF, H264) += fate-h264-xavc-4389 FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-attachment-631 +FATE_H264-$(call DEMDEC, MPEGTS, H264) += fate-h264-skip-nokey fate-h264-skip-nointra FATE_H264_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-h264-dts_5frames FATE_SAMPLES_AVCONV += $(FATE_H264-yes) @@ -412,6 +413,8 @@ fate-h264-direct-bff: CMD = framecrc -i $(TARGET_SAM fate-h264-brokensps-2580: CMD = framecrc -i $(TARGET_SAMPLES)/h264/brokensps.flv -vf format=yuv420p,scale=w=192:h=144 -sws_flags bitexact+bilinear fate-h264-xavc-4389: CMD = framecrc -i $(TARGET_SAMPLES)/h264/SonyXAVC_LongGOP_green_pixelation_early_Frames.MXF -pix_fmt yuv422p10le fate-h264-attachment-631: CMD = framecrc -i $(TARGET_SAMPLES)/h264/attachment631-small.mp4 -an -max_error_rate 0.95 +fate-h264-skip-nokey: CMD = framecrc -skip_frame nokey -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts +fate-h264-skip-nointra: CMD = framecrc -skip_frame nointra -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts fate-h264-invalid-ref-mod: CMD = framecrc -i $(TARGET_SAMPLES)/h264/h264refframeregression.mp4 -an -frames 10 -pix_fmt yuv420p10le fate-h264-unescaped-extradata: CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10 diff --git a/tests/ref/fate/h264-skip-nointra b/tests/ref/fate/h264-skip-nointra new file mode 100644 index 0000000..40b5bb2 --- /dev/null +++ b/tests/ref/fate/h264-skip-nointra @@ -0,0 +1,54 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1920x1080 +#sar 0: 1/1 +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: pcm_s16le +#sample_rate 1: 48000 +#channel_layout 1: 3 +1, 0, 0, 1152, 4608, 0x00000000 +1, 1152, 1152, 1152, 4608, 0x00000000 +1, 2304, 2304, 1152, 4608, 0x00000000 +1, 3456, 3456, 1152, 4608, 0x00000000 +1, 4608, 4608, 1152, 4608, 0x00000000 +1, 5760, 5760, 1152, 4608, 0x00000000 +1, 6912, 6912, 1152, 4608, 0x00000000 +1, 8064, 8064, 1152, 4608, 0x00000000 +1, 9216, 9216, 1152, 4608, 0x00000000 +1, 10368, 10368, 1152, 4608, 0x00000000 +1, 11520, 11520, 1152, 4608, 0x00000000 +1, 12672, 12672, 1152, 4608, 0x00000000 +1, 13824, 13824, 1152, 4608, 0x00000000 +1, 14976, 14976, 1152, 4608, 0x00000000 +1, 16128, 16128, 1152, 4608, 0x00000000 +1, 17280, 17280, 1152, 4608, 0x00000000 +1, 18432, 18432, 1152, 4608, 0x00000000 +1, 19584, 19584, 1152, 4608, 0x00000000 +1, 20736, 20736, 1152, 4608, 0x00000000 +1, 21888, 21888, 1152, 4608, 0x00000000 +1, 23040, 23040, 1152, 4608, 0x00000000 +1, 24192, 24192, 1152, 4608, 0x00000000 +1, 25344, 25344, 1152, 4608, 0x00000000 +1, 26496, 26496, 1152, 4608, 0x00000000 +1, 27648, 27648, 1152, 4608, 0x00000000 +1, 28800, 28800, 1152, 4608, 0x00000000 +1, 29952, 29952, 1152, 4608, 0x00000000 +1, 31104, 31104, 1152, 4608, 0x00000000 +1, 32256, 32256, 1152, 4608, 0x00000000 +1, 33408, 33408, 1152, 4608, 0x00000000 +1, 34560, 34560, 1152, 4608, 0x00000000 +1, 35712, 35712, 1152, 4608, 0x00000000 +1, 36864, 36864, 1152, 4608, 0x00000000 +1, 38016, 38016, 1152, 4608, 0x00000000 +1, 39168, 39168, 1152, 4608, 0x00000000 +1, 40320, 40320, 1152, 4608, 0x00000000 +1, 41472, 41472, 1152, 4608, 0x00000000 +1, 42624, 42624, 1152, 4608, 0x00000000 +1, 43776, 43776, 1152, 4608, 0x00000000 +1, 44928, 44928, 1152, 4608, 0x00000000 +1, 46080, 46080, 1152, 4608, 0x00000000 +1, 47232, 47232, 1152, 4608, 0x00000000 +1, 48384, 48384, 1152, 4608, 0x9eca8b7c +0, 45, 45, 1, 3110400, 0xa426f15d diff --git a/tests/ref/fate/h264-skip-nokey b/tests/ref/fate/h264-skip-nokey new file mode 100644 index 0000000..40b5bb2 --- /dev/null +++ b/tests/ref/fate/h264-skip-nokey @@ -0,0 +1,54 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1920x1080 +#sar 0: 1/1 +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: pcm_s16le +#sample_rate 1: 48000 +#channel_layout 1: 3 +1, 0, 0, 1152, 4608, 0x00000000 +1, 1152, 1152, 1152, 4608, 0x00000000 +1, 2304, 2304, 1152, 4608, 0x00000000 +1, 3456, 3456, 1152, 4608, 0x00000000 +1, 4608, 4608, 1152, 4608, 0x00000000 +1, 5760, 5760, 1152, 4608, 0x00000000 +1, 6912, 6912, 1152, 4608, 0x00000000 +1, 8064, 8064, 1152, 4608, 0x00000000 +1, 9216, 9216, 1152, 4608, 0x00000000 +1, 10368, 10368, 1152, 4608, 0x00000000 +1, 11520, 11520, 1152, 4608, 0x00000000 +1, 12672, 12672, 1152, 4608, 0x00000000 +1, 13824, 13824, 1152, 4608, 0x00000000 +1, 14976, 14976, 1152, 4608, 0x00000000 +1, 16128, 16128, 1152, 4608, 0x00000000 +1, 17280, 17280, 1152, 4608, 0x00000000 +1, 18432, 18432, 1152, 4608, 0x00000000 +1, 19584, 19584, 1152, 4608, 0x00000000 +1, 20736, 20736, 1152, 4608, 0x00000000 +1, 21888, 21888, 1152, 4608, 0x00000000 +1, 23040, 23040, 1152, 4608, 0x00000000 +1, 24192, 24192, 1152, 4608, 0x00000000 +1, 25344, 25344, 1152, 4608, 0x00000000 +1, 26496, 26496, 1152, 4608, 0x00000000 +1, 27648, 27648, 1152, 4608, 0x00000000 +1, 28800, 28800, 1152, 4608, 0x00000000 +1, 29952, 29952, 1152, 4608, 0x00000000 +1, 31104, 31104, 1152, 4608, 0x00000000 +1, 32256, 32256, 1152, 4608, 0x00000000 +1, 33408, 33408, 1152, 4608, 0x00000000 +1, 34560, 34560, 1152, 4608, 0x00000000 +1, 35712, 35712, 1152, 4608, 0x00000000 +1, 36864, 36864, 1152, 4608, 0x00000000 +1, 38016, 38016, 1152, 4608, 0x00000000 +1, 39168, 39168, 1152, 4608, 0x00000000 +1, 40320, 40320, 1152, 4608, 0x00000000 +1, 41472, 41472, 1152, 4608, 0x00000000 +1, 42624, 42624, 1152, 4608, 0x00000000 +1, 43776, 43776, 1152, 4608, 0x00000000 +1, 44928, 44928, 1152, 4608, 0x00000000 +1, 46080, 46080, 1152, 4608, 0x00000000 +1, 47232, 47232, 1152, 4608, 0x00000000 +1, 48384, 48384, 1152, 4608, 0x9eca8b7c +0, 45, 45, 1, 3110400, 0xa426f15d

1 0

lavc/h264_slice: properly forward positive "error" code
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 16:13:36 2016 +0200| [a2901472fe187c346412c0a2a4b6d988f7f076c5] | committer: Clément Bœsch lavc/h264_slice: properly forward positive "error" code Fixes ./ffmpeg -skip_frame nokey -i h264/h264_intra_first-small.ts Regression since c54e2740e1f4a8fb7fa4e521755bf4158c4cda51 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2901472fe187c346… --- libavcodec/h264_slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 522a36c..0c36c8f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1702,7 +1702,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) int i, j, ret = 0; ret = h264_slice_header_parse(h, sl); - if (ret < 0) + if (ret) // can not be ret<0 because of SLICE_SKIPED, SLICE_SINGLETHREAD, ... return ret; if (sl->slice_type_nos == AV_PICTURE_TYPE_B && !sl->direct_spatial_mv_pred)

1 0

Merge commit 'fa57059079190242517701120cfdccad93c866da'
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 15:29:38 2016 +0200| [cdecb39fca81967ff9e021c776b3212b1870188e] | committer: Clément Bœsch Merge commit 'fa57059079190242517701120cfdccad93c866da' * commit 'fa57059079190242517701120cfdccad93c866da': h264: move initialising the implicit pred weight table for MBAFF Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdecb39fca81967ff… --- libavcodec/h264_slice.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 666d99f..522a36c 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1607,6 +1607,10 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) else if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { implicit_weight_table(h, sl, -1); + if (FRAME_MBAFF(h)) { + implicit_weight_table(h, sl, 0); + implicit_weight_table(h, sl, 1); + } } else { sl->pwt.use_weight = 0; for (i = 0; i < 2; i++) { @@ -1628,13 +1632,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) return AVERROR_INVALIDDATA; } - if (FRAME_MBAFF(h)) { - if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { - implicit_weight_table(h, sl, 0); - implicit_weight_table(h, sl, 1); - } - } - if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { tmp = get_ue_golomb_31(&sl->gb); if (tmp > 2) { ======================================================================

1 0

h264: move initialising the implicit pred weight table for MBAFF
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Apr 15 15:02:33 2016 +0200| [fa57059079190242517701120cfdccad93c866da] | committer: Anton Khirnov h264: move initialising the implicit pred weight table for MBAFF Do it where the normal implicit table is initialised. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa570590791902425… --- libavcodec/h264_slice.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 33f9f57..031f8cc 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1357,6 +1357,10 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) else if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { implicit_weight_table(h, sl, -1); + if (FRAME_MBAFF(h)) { + implicit_weight_table(h, sl, 0); + implicit_weight_table(h, sl, 1); + } } else { sl->pwt.use_weight = 0; for (i = 0; i < 2; i++) { @@ -1378,13 +1382,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) return AVERROR_INVALIDDATA; } - if (FRAME_MBAFF(h)) { - if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { - implicit_weight_table(h, sl, 0); - implicit_weight_table(h, sl, 1); - } - } - if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { tmp = get_ue_golomb_31(&sl->gb); if (tmp > 2) {

1 0

Merge commit '7b50d60442af8d9527e9da46818011fe15a5265a'
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 15:17:16 2016 +0200| [527a57932765f493529449f13d0d79ee5c7116e1] | committer: Clément Bœsch Merge commit '7b50d60442af8d9527e9da46818011fe15a5265a' * commit '7b50d60442af8d9527e9da46818011fe15a5265a': h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=527a57932765f4935… --- libavcodec/h264.h | 1 - libavcodec/h264_refs.c | 53 +++++++++++++++++++++++++---------------------- libavcodec/h264_slice.c | 2 -- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 133f4b7..50fd45a 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -715,7 +715,6 @@ int ff_h264_get_slice_type(const H264SliceContext *sl); int ff_h264_alloc_tables(H264Context *h); int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl); -void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index b6bb8f2..15957a3 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -270,6 +270,31 @@ static int pic_num_extract(const H264Context *h, int pic_num, int *structure) return pic_num; } +static void h264_fill_mbaff_ref_list(H264SliceContext *sl) +{ + int list, i, j; + for (list = 0; list < sl->list_count; list++) { + for (i = 0; i < sl->ref_count[list]; i++) { + H264Ref *frame = &sl->ref_list[list][i]; + H264Ref *field = &sl->ref_list[list][16 + 2 * i]; + + field[0] = *frame; + + for (j = 0; j < 3; j++) + field[0].linesize[j] <<= 1; + field[0].reference = PICT_TOP_FIELD; + field[0].poc = field[0].parent->field_poc[0]; + + field[1] = field[0]; + + for (j = 0; j < 3; j++) + field[1].data[j] += frame->parent->f->linesize[j]; + field[1].reference = PICT_BOTTOM_FIELD; + field[1].poc = field[1].parent->field_poc[1]; + } + } +} + int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) { int list, index, pic_structure; @@ -398,32 +423,10 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) } } - return 0; -} - -void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl) -{ - int list, i, j; - for (list = 0; list < sl->list_count; list++) { - for (i = 0; i < sl->ref_count[list]; i++) { - H264Ref *frame = &sl->ref_list[list][i]; - H264Ref *field = &sl->ref_list[list][16 + 2 * i]; - - field[0] = *frame; - - for (j = 0; j < 3; j++) - field[0].linesize[j] <<= 1; - field[0].reference = PICT_TOP_FIELD; - field[0].poc = field[0].parent->field_poc[0]; + if (FRAME_MBAFF(h)) + h264_fill_mbaff_ref_list(sl); - field[1] = field[0]; - - for (j = 0; j < 3; j++) - field[1].data[j] += frame->parent->f->linesize[j]; - field[1].reference = PICT_BOTTOM_FIELD; - field[1].poc = field[1].parent->field_poc[1]; - } - } + return 0; } /** diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 497a99c..666d99f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1629,8 +1629,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) } if (FRAME_MBAFF(h)) { - ff_h264_fill_mbaff_ref_list(sl); - if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { implicit_weight_table(h, sl, 0); implicit_weight_table(h, sl, 1); ====================================================================== diff --cc libavcodec/h264.h index 133f4b7,034507d..50fd45a --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@@ -714,8 -656,7 +714,7 @@@ int ff_h264_get_slice_type(const H264Sl */ int ff_h264_alloc_tables(H264Context *h); -int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl); +int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl); - void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** diff --cc libavcodec/h264_refs.c index b6bb8f2,b4dfbbc..15957a3 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@@ -270,7 -227,32 +270,32 @@@ static int pic_num_extract(const H264Co return pic_num; } + static void h264_fill_mbaff_ref_list(H264SliceContext *sl) + { + int list, i, j; + for (list = 0; list < sl->list_count; list++) { + for (i = 0; i < sl->ref_count[list]; i++) { + H264Ref *frame = &sl->ref_list[list][i]; + H264Ref *field = &sl->ref_list[list][16 + 2 * i]; + + field[0] = *frame; + + for (j = 0; j < 3; j++) + field[0].linesize[j] <<= 1; + field[0].reference = PICT_TOP_FIELD; + field[0].poc = field[0].parent->field_poc[0]; + + field[1] = field[0]; + + for (j = 0; j < 3; j++) + field[1].data[j] += frame->parent->f->linesize[j]; + field[1].reference = PICT_BOTTOM_FIELD; + field[1].poc = field[1].parent->field_poc[1]; + } + } + } + -int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl) +int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) { int list, index, pic_structure;

1 0

h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Apr 15 15:00:29 2016 +0200| [7b50d60442af8d9527e9da46818011fe15a5265a] | committer: Anton Khirnov h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list There is no real reason to call it separately. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b50d60442af8d952… --- libavcodec/h264.h | 1 - libavcodec/h264_refs.c | 53 +++++++++++++++++++++++++---------------------- libavcodec/h264_slice.c | 2 -- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 41ff1f9..034507d 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -657,7 +657,6 @@ int ff_h264_get_slice_type(const H264SliceContext *sl); int ff_h264_alloc_tables(H264Context *h); int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl); -void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index b2f255f..b4dfbbc 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -227,6 +227,31 @@ static int pic_num_extract(const H264Context *h, int pic_num, int *structure) return pic_num; } +static void h264_fill_mbaff_ref_list(H264SliceContext *sl) +{ + int list, i, j; + for (list = 0; list < sl->list_count; list++) { + for (i = 0; i < sl->ref_count[list]; i++) { + H264Ref *frame = &sl->ref_list[list][i]; + H264Ref *field = &sl->ref_list[list][16 + 2 * i]; + + field[0] = *frame; + + for (j = 0; j < 3; j++) + field[0].linesize[j] <<= 1; + field[0].reference = PICT_TOP_FIELD; + field[0].poc = field[0].parent->field_poc[0]; + + field[1] = field[0]; + + for (j = 0; j < 3; j++) + field[1].data[j] += frame->parent->f->linesize[j]; + field[1].reference = PICT_BOTTOM_FIELD; + field[1].poc = field[1].parent->field_poc[1]; + } + } +} + int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl) { int list, index, pic_structure; @@ -349,32 +374,10 @@ int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContex } } - return 0; -} - -void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl) -{ - int list, i, j; - for (list = 0; list < sl->list_count; list++) { - for (i = 0; i < sl->ref_count[list]; i++) { - H264Ref *frame = &sl->ref_list[list][i]; - H264Ref *field = &sl->ref_list[list][16 + 2 * i]; - - field[0] = *frame; - - for (j = 0; j < 3; j++) - field[0].linesize[j] <<= 1; - field[0].reference = PICT_TOP_FIELD; - field[0].poc = field[0].parent->field_poc[0]; + if (FRAME_MBAFF(h)) + h264_fill_mbaff_ref_list(sl); - field[1] = field[0]; - - for (j = 0; j < 3; j++) - field[1].data[j] += frame->parent->f->linesize[j]; - field[1].reference = PICT_BOTTOM_FIELD; - field[1].poc = field[1].parent->field_poc[1]; - } - } + return 0; } /** diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index aefb375..33f9f57 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1379,8 +1379,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) } if (FRAME_MBAFF(h)) { - ff_h264_fill_mbaff_ref_list(sl); - if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { implicit_weight_table(h, sl, 0); implicit_weight_table(h, sl, 1);

1 0