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

Merge commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4'
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:03:12 2016 +0200| [d7a2451688442d2736f4811267277c7051f414a6] | committer: Clément Bœsch Merge commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4' * commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4': h264: move initialising the explicit 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=d7a2451688442d273… --- libavcodec/h264_parse.c | 10 +++++++++- libavcodec/h264_refs.c | 7 ------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index a63530d..b7f9a2e 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -26,7 +26,7 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, const int *ref_count, int slice_type_nos, H264PredWeightTable *pwt, void *logctx) { - int list, i; + int list, i, j; int luma_def, chroma_def; pwt->use_weight = 0; @@ -88,6 +88,14 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, } } } + + // for MBAFF + pwt->luma_weight[16 + 2 * i][list][0] = pwt->luma_weight[16 + 2 * i + 1][list][0] = pwt->luma_weight[i][list][0]; + pwt->luma_weight[16 + 2 * i][list][1] = pwt->luma_weight[16 + 2 * i + 1][list][1] = pwt->luma_weight[i][list][1]; + for (j = 0; j < 2; j++) { + pwt->chroma_weight[16 + 2 * i][list][j][0] = pwt->chroma_weight[16 + 2 * i + 1][list][j][0] = pwt->chroma_weight[i][list][j][0]; + pwt->chroma_weight[16 + 2 * i][list][j][1] = pwt->chroma_weight[16 + 2 * i + 1][list][j][1] = pwt->chroma_weight[i][list][j][1]; + } } if (slice_type_nos != AV_PICTURE_TYPE_B) break; diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 2f80de1..b6bb8f2 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -422,13 +422,6 @@ void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl) field[1].data[j] += frame->parent->f->linesize[j]; field[1].reference = PICT_BOTTOM_FIELD; field[1].poc = field[1].parent->field_poc[1]; - - sl->pwt.luma_weight[16 + 2 * i][list][0] = sl->pwt.luma_weight[16 + 2 * i + 1][list][0] = sl->pwt.luma_weight[i][list][0]; - sl->pwt.luma_weight[16 + 2 * i][list][1] = sl->pwt.luma_weight[16 + 2 * i + 1][list][1] = sl->pwt.luma_weight[i][list][1]; - for (j = 0; j < 2; j++) { - sl->pwt.chroma_weight[16 + 2 * i][list][j][0] = sl->pwt.chroma_weight[16 + 2 * i + 1][list][j][0] = sl->pwt.chroma_weight[i][list][j][0]; - sl->pwt.chroma_weight[16 + 2 * i][list][j][1] = sl->pwt.chroma_weight[16 + 2 * i + 1][list][j][1] = sl->pwt.chroma_weight[i][list][j][1]; - } } } } ====================================================================== diff --cc libavcodec/h264_parse.c index a63530d,052e8e4..b7f9a2e --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@@ -24,9 -24,9 +24,9 @@@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, const int *ref_count, int slice_type_nos, - H264PredWeightTable *pwt) + H264PredWeightTable *pwt, void *logctx) { - int list, i; + int list, i, j; int luma_def, chroma_def; pwt->use_weight = 0;

1 0

h264: move initialising the explicit 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 14:45:48 2016 +0200| [b16e9b9ac9db449cae2242767dd3c3fc309357c4] | committer: Anton Khirnov h264: move initialising the explicit pred weight table for MBAFF Currently it's done in the code that initialises the ref list for MBAFF, which is not a logical place for it. Move it to the function that parses the pred table from the bitstream, which is analogous to what is done for the implicit weight table as well. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b16e9b9ac9db449ca… --- libavcodec/h264_parse.c | 10 +++++++++- libavcodec/h264_refs.c | 7 ------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 7211c9d..052e8e4 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -26,7 +26,7 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, const int *ref_count, int slice_type_nos, H264PredWeightTable *pwt) { - int list, i; + int list, i, j; int luma_def, chroma_def; pwt->use_weight = 0; @@ -78,6 +78,14 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, } } } + + // for MBAFF + pwt->luma_weight[16 + 2 * i][list][0] = pwt->luma_weight[16 + 2 * i + 1][list][0] = pwt->luma_weight[i][list][0]; + pwt->luma_weight[16 + 2 * i][list][1] = pwt->luma_weight[16 + 2 * i + 1][list][1] = pwt->luma_weight[i][list][1]; + for (j = 0; j < 2; j++) { + pwt->chroma_weight[16 + 2 * i][list][j][0] = pwt->chroma_weight[16 + 2 * i + 1][list][j][0] = pwt->chroma_weight[i][list][j][0]; + pwt->chroma_weight[16 + 2 * i][list][j][1] = pwt->chroma_weight[16 + 2 * i + 1][list][j][1] = pwt->chroma_weight[i][list][j][1]; + } } if (slice_type_nos != AV_PICTURE_TYPE_B) break; diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index a925b44..b2f255f 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -373,13 +373,6 @@ void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl) field[1].data[j] += frame->parent->f->linesize[j]; field[1].reference = PICT_BOTTOM_FIELD; field[1].poc = field[1].parent->field_poc[1]; - - sl->pwt.luma_weight[16 + 2 * i][list][0] = sl->pwt.luma_weight[16 + 2 * i + 1][list][0] = sl->pwt.luma_weight[i][list][0]; - sl->pwt.luma_weight[16 + 2 * i][list][1] = sl->pwt.luma_weight[16 + 2 * i + 1][list][1] = sl->pwt.luma_weight[i][list][1]; - for (j = 0; j < 2; j++) { - sl->pwt.chroma_weight[16 + 2 * i][list][j][0] = sl->pwt.chroma_weight[16 + 2 * i + 1][list][j][0] = sl->pwt.chroma_weight[i][list][j][0]; - sl->pwt.chroma_weight[16 + 2 * i][list][j][1] = sl->pwt.chroma_weight[16 + 2 * i + 1][list][j][1] = sl->pwt.chroma_weight[i][list][j][1]; - } } } }

1 0

Merge commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6'
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:00:01 2016 +0200| [7f607120d99762b07b94e97ce3e32a60b8d114a2] | committer: Clément Bœsch Merge commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6' * commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6': h264: drop an outdated comment This commit is a noop, see 237d31e0b98b95eef687e612177ca3ea24b709fc Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f607120d99762b07… ---

1 0

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

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 14:58:31 2016 +0200| [3c5a3882f988aba19a984e80119d72ca9d32b7d4] | committer: Clément Bœsch Merge commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e' * commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e': h264: move direct mode inits out of h264_slice_header_parse() Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c5a3882f988aba19… --- libavcodec/h264_slice.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index cab674f..497a99c 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1637,10 +1637,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) } } - 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); - if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { tmp = get_ue_golomb_31(&sl->gb); if (tmp > 2) { @@ -1714,6 +1710,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (ret < 0) return ret; + 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); + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->nal_unit_type != NAL_IDR_SLICE) || ====================================================================== diff --cc libavcodec/h264_slice.c index cab674f,aefb375..497a99c --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@@ -1714,10 -1460,12 +1710,14 @@@ int ff_h264_decode_slice_header(H264Con if (ret < 0) return ret; + 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); + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && + h->nal_unit_type != NAL_IDR_SLICE) || + (h->avctx->skip_loop_filter >= AVDISCARD_NONINTRA && sl->slice_type_nos != AV_PICTURE_TYPE_I) || (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR && sl->slice_type_nos == AV_PICTURE_TYPE_B) ||

1 0

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

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 14:55:02 2016 +0200| [c54e2740e1f4a8fb7fa4e521755bf4158c4cda51] | committer: Clément Bœsch Merge commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74' * commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74': h264: start splitting decode_slice_header() Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c54e2740e1f4a8fb7… --- libavcodec/h264_slice.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 45c23c8..cab674f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1020,22 +1020,14 @@ static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a) } } -/** - * Decode a slice header. - * This will (re)initialize the decoder and call h264_frame_start() as needed. - * - * @param h h264context - * - * @return 0 if okay, <0 if an error occurred - */ -int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) +static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) { const SPS *sps; const PPS *pps; unsigned int first_mb_in_slice; unsigned int pps_id; int ret; - unsigned int slice_type, tmp, i, j; + unsigned int slice_type, tmp, i; int last_pic_structure, last_pic_droppable; int must_reinit; int needs_reinit = 0; @@ -1703,6 +1695,25 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } } + return 0; +} + +/** + * Decode a slice header. + * This will (re)initialize the decoder and call h264_frame_start() as needed. + * + * @param h h264context + * + * @return 0 if okay, <0 if an error occurred + */ +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) + return ret; + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->nal_unit_type != NAL_IDR_SLICE) || @@ -1726,9 +1737,9 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) sl->qp_thresh = 15 - FFMIN(sl->slice_alpha_c0_offset, sl->slice_beta_offset) - FFMAX3(0, - pps->chroma_qp_index_offset[0], - pps->chroma_qp_index_offset[1]) + - 6 * (sps->bit_depth_luma - 8); + h->ps.pps->chroma_qp_index_offset[0], + h->ps.pps->chroma_qp_index_offset[1]) + + 6 * (h->ps.sps->bit_depth_luma - 8); sl->slice_num = ++h->current_slice; @@ -1776,14 +1787,14 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG, - "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", + "slice:%d %s mb:%d %c%s%s frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", sl->slice_num, (h->picture_structure == PICT_FRAME ? "F" : h->picture_structure == PICT_TOP_FIELD ? "T" : "B"), - first_mb_in_slice, + sl->mb_y * h->mb_width + sl->mb_x, av_get_picture_type_char(sl->slice_type), sl->slice_type_fixed ? " fix" : "", h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "", - pps_id, h->poc.frame_num, + h->poc.frame_num, h->cur_pic_ptr->field_poc[0], h->cur_pic_ptr->field_poc[1], sl->ref_count[0], sl->ref_count[1], ====================================================================== diff --cc libavcodec/h264_slice.c index 45c23c8,404e333..cab674f --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@@ -1003,85 -899,30 +1003,77 @@@ static int h264_slice_header_init(H264C h->context_initialized = 1; return 0; +fail: + ff_h264_free_tables(h); + h->context_initialized = 0; + return ret; +} + +static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a) +{ + switch (a) { + case AV_PIX_FMT_YUVJ420P: return AV_PIX_FMT_YUV420P; + case AV_PIX_FMT_YUVJ422P: return AV_PIX_FMT_YUV422P; + case AV_PIX_FMT_YUVJ444P: return AV_PIX_FMT_YUV444P; + default: + return a; + } } - /** - * Decode a slice header. - * This will (re)initialize the decoder and call h264_frame_start() as needed. - * - * @param h h264context - * - * @return 0 if okay, <0 if an error occurred - */ - int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) + static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) { const SPS *sps; const PPS *pps; unsigned int first_mb_in_slice; unsigned int pps_id; int ret; - unsigned int slice_type, tmp, i, j; + unsigned int slice_type, tmp, i; int last_pic_structure, last_pic_droppable; + int must_reinit; int needs_reinit = 0; int field_pic_flag, bottom_field_flag; + int first_slice = sl == h->slice_ctx && !h->current_slice; int frame_num, droppable, picture_structure; - int mb_aff_frame = 0; + int mb_aff_frame, last_mb_aff_frame; - first_mb_in_slice = get_ue_golomb(&sl->gb); + if (first_slice) + av_assert0(!h->setup_finished); + + first_mb_in_slice = get_ue_golomb_long(&sl->gb); if (first_mb_in_slice == 0) { // FIXME better field boundary detection - if (h->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) { - ff_h264_field_end(h, sl, 1); + if (h->current_slice) { + if (h->setup_finished) { + av_log(h->avctx, AV_LOG_ERROR, "Too many fields\n"); + return AVERROR_INVALIDDATA; + } + if (h->max_contexts > 1) { + if (!h->single_decode_warning) { + av_log(h->avctx, AV_LOG_WARNING, "Cannot decode multiple access units as slice threads\n"); + h->single_decode_warning = 1; + } + h->max_contexts = 1; + return SLICE_SINGLETHREAD; + } + + if (h->cur_pic_ptr && FIELD_PICTURE(h) && h->first_field) { + ret = ff_h264_field_end(h, h->slice_ctx, 1); + h->current_slice = 0; + if (ret < 0) + return ret; + } else if (h->cur_pic_ptr && !FIELD_PICTURE(h) && !h->first_field && h->nal_unit_type == NAL_IDR_SLICE) { + av_log(h, AV_LOG_WARNING, "Broken frame packetizing\n"); + ret = ff_h264_field_end(h, h->slice_ctx, 1); + h->current_slice = 0; + ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 0); + ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 1); + h->cur_pic_ptr = NULL; + if (ret < 0) + return ret; + } else + return AVERROR_INVALIDDATA; } - h->current_slice = 0; if (!h->first_field) { if (h->cur_pic_ptr && !h->droppable) { ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, @@@ -1703,10 -1445,27 +1695,29 @@@ } } + return 0; + } + + /** + * Decode a slice header. + * This will (re)initialize the decoder and call h264_frame_start() as needed. + * + * @param h h264context + * + * @return 0 if okay, <0 if an error occurred + */ + 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) + return ret; + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && + h->nal_unit_type != NAL_IDR_SLICE) || + (h->avctx->skip_loop_filter >= AVDISCARD_NONINTRA && sl->slice_type_nos != AV_PICTURE_TYPE_I) || (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR && sl->slice_type_nos == AV_PICTURE_TYPE_B) || @@@ -1726,19 -1485,14 +1737,19 @@@ sl->qp_thresh = 15 - FFMIN(sl->slice_alpha_c0_offset, sl->slice_beta_offset) - FFMAX3(0, - pps->chroma_qp_index_offset[0], - pps->chroma_qp_index_offset[1]) + - 6 * (sps->bit_depth_luma - 8); + h->ps.pps->chroma_qp_index_offset[0], + h->ps.pps->chroma_qp_index_offset[1]) + + 6 * (h->ps.sps->bit_depth_luma - 8); sl->slice_num = ++h->current_slice; - if (sl->slice_num >= MAX_SLICES) { - av_log(h->avctx, AV_LOG_ERROR, - "Too many slices, increase MAX_SLICES and recompile\n"); + + if (sl->slice_num) + h->slice_row[(sl->slice_num-1)&(MAX_SLICES-1)]= sl->resync_mb_y; + if ( h->slice_row[sl->slice_num&(MAX_SLICES-1)] + 3 >= sl->resync_mb_y + && h->slice_row[sl->slice_num&(MAX_SLICES-1)] <= sl->resync_mb_y + && sl->slice_num >= MAX_SLICES) { + //in case of ASO this check needs to be updated depending on how we decide to assign slice numbers in this case + av_log(h->avctx, AV_LOG_WARNING, "Possibly too many slices (%d >= %d), increase MAX_SLICES and recompile if there are artifacts\n", sl->slice_num, MAX_SLICES); } for (j = 0; j < 2; j++) {

1 0

h264: drop an outdated comment
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Apr 14 20:59:20 2016 +0200| [b93c0aed79f7f942e0dec26e53c147f297ce2ff6] | committer: Anton Khirnov h264: drop an outdated comment > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b93c0aed79f7f942e… --- libavcodec/h264_refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 427930c..a925b44 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -355,7 +355,7 @@ int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContex void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl) { int list, i, j; - for (list = 0; list < sl->list_count; list++) { //FIXME try list_count + 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];

1 0

h264: move direct mode inits 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| [77a1e2c5f8f8250dfacff24b993eb473260ed13e] | committer: Anton Khirnov h264: move direct mode inits out of h264_slice_header_parse() This code does not do any bitstream parsing, it just initializes some internal state. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77a1e2c5f8f8250df… --- libavcodec/h264_slice.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 404e333..aefb375 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1387,10 +1387,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) } } - 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); - if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { tmp = get_ue_golomb_31(&sl->gb); if (tmp > 2) { @@ -1464,6 +1460,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (ret < 0) return ret; + 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); + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && sl->slice_type_nos != AV_PICTURE_TYPE_I) ||

1 0

h264: start splitting decode_slice_header()
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Apr 13 17:53:50 2016 +0200| [d06e4d8aab9c679b6aea2591d2a9b382df9e5f74] | committer: Anton Khirnov h264: start splitting decode_slice_header() That function is currently very long and entangles bitstream parsing and decoder configuration. This makes the code much harder to read than necessary. Begin splitting the code that configures the decoder state based on the slice header information from the parsing of the slice header. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d06e4d8aab9c679b6… --- libavcodec/h264_slice.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 7031ee2..404e333 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -901,22 +901,14 @@ static int h264_slice_header_init(H264Context *h) return 0; } -/** - * Decode a slice header. - * This will (re)initialize the decoder and call h264_frame_start() as needed. - * - * @param h h264context - * - * @return 0 if okay, <0 if an error occurred - */ -int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) +static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) { const SPS *sps; const PPS *pps; unsigned int first_mb_in_slice; unsigned int pps_id; int ret; - unsigned int slice_type, tmp, i, j; + unsigned int slice_type, tmp, i; int last_pic_structure, last_pic_droppable; int needs_reinit = 0; int field_pic_flag, bottom_field_flag; @@ -1453,6 +1445,25 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } } + return 0; +} + +/** + * Decode a slice header. + * This will (re)initialize the decoder and call h264_frame_start() as needed. + * + * @param h h264context + * + * @return 0 if okay, <0 if an error occurred + */ +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) + return ret; + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && sl->slice_type_nos != AV_PICTURE_TYPE_I) || @@ -1474,9 +1485,9 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) sl->qp_thresh = 15 - FFMIN(sl->slice_alpha_c0_offset, sl->slice_beta_offset) - FFMAX3(0, - pps->chroma_qp_index_offset[0], - pps->chroma_qp_index_offset[1]) + - 6 * (sps->bit_depth_luma - 8); + h->ps.pps->chroma_qp_index_offset[0], + h->ps.pps->chroma_qp_index_offset[1]) + + 6 * (h->ps.sps->bit_depth_luma - 8); sl->slice_num = ++h->current_slice; if (sl->slice_num >= MAX_SLICES) { @@ -1519,14 +1530,14 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG, - "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", + "slice:%d %s mb:%d %c%s%s frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", sl->slice_num, (h->picture_structure == PICT_FRAME ? "F" : h->picture_structure == PICT_TOP_FIELD ? "T" : "B"), - first_mb_in_slice, + sl->mb_y * h->mb_width + sl->mb_x, av_get_picture_type_char(sl->slice_type), sl->slice_type_fixed ? " fix" : "", h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "", - pps_id, h->poc.frame_num, + h->poc.frame_num, h->cur_pic_ptr->field_poc[0], h->cur_pic_ptr->field_poc[1], sl->ref_count[0], sl->ref_count[1],

1 0

avcodec/h264: Remove au_pps_id
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Jun 29 14:39:46 2016 +0200| [0c50f6905fb3cc18577e17db1993dc959d6a3db5] | committer: Michael Niedermayer avcodec/h264: Remove au_pps_id This should not be needed anymore and simplifies the next merge Requested-by: Clément Bœsch <u(a)pkh.me> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c50f6905fb3cc185… --- libavcodec/h264.c | 3 --- libavcodec/h264.h | 3 --- libavcodec/h264_slice.c | 8 -------- 3 files changed, 14 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 935f2d0..8eb3b13 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -950,9 +950,6 @@ again: h->has_recovery_point = 1; case NAL_SLICE: sl->gb = nal->gb; - if ( nals_needed >= i - || (!(avctx->active_thread_type & FF_THREAD_FRAME) && !context_count)) - h->au_pps_id = -1; if ((err = ff_h264_decode_slice_header(h, sl))) break; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index cb24e33..133f4b7 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -515,9 +515,6 @@ typedef struct H264Context { uint32_t *mb2br_xy; int b_stride; // FIXME use s->b4_stride - - int au_pps_id; ///< pps_id of current access unit - uint16_t *slice_table; ///< slice_table_base + 2*mb_stride + 1 // interlacing specific flags diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 16595e0..45c23c8 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1139,12 +1139,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) pps_id); return AVERROR_INVALIDDATA; } - if (h->au_pps_id >= 0 && pps_id != h->au_pps_id) { - av_log(h->avctx, AV_LOG_ERROR, - "PPS change from %d to %d forbidden\n", - h->au_pps_id, pps_id); - return AVERROR_INVALIDDATA; - } pps = (const PPS*)h->ps.pps_list[pps_id]->data; @@ -1780,8 +1774,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) (sl->ref_list[j][i].reference & 3); } - h->au_pps_id = pps_id; - if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n",

1 0

avcodec/h264: Remove current_sps_id
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Jun 29 14:31:04 2016 +0200| [e6e8750e943215535b35820cbe1533696512b613] | committer: Michael Niedermayer avcodec/h264: Remove current_sps_id This should not be needed anymore and simplifies the next merge Requested-by: Clément Bœsch <u(a)pkh.me> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6e8750e943215535… --- libavcodec/h264.c | 1 - libavcodec/h264.h | 2 -- libavcodec/h264_slice.c | 5 +---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a61379c..935f2d0 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -308,7 +308,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) h->backup_width = -1; h->backup_height = -1; h->backup_pix_fmt = AV_PIX_FMT_NONE; - h->current_sps_id = -1; h->cur_chroma_format_idc = -1; h->picture_structure = PICT_FRAME; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index f91e5be..cb24e33 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -516,8 +516,6 @@ typedef struct H264Context { int b_stride; // FIXME use s->b4_stride - unsigned current_sps_id; ///< id of the current SPS - int au_pps_id; ///< pps_id of current access unit uint16_t *slice_table; ///< slice_table_base + 2*mb_stride + 1 diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 474400b..16595e0 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1171,9 +1171,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } } - if (h->ps.sps != (const SPS*)h->ps.sps_list[h->ps.pps->sps_id]->data || - pps->sps_id != h->current_sps_id) { - + if (h->ps.sps != (const SPS*)h->ps.sps_list[h->ps.pps->sps_id]->data) { if (!first_slice) { av_log(h->avctx, AV_LOG_ERROR, "SPS changed in the middle of the frame\n"); @@ -1783,7 +1781,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } h->au_pps_id = pps_id; - h->current_sps_id = h->ps.pps->sps_id; if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG,

1 0