diff options
author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2017-01-16 13:33:47 +0300 |
---|---|---|
committer | Matthieu Bouron <matthieu.bouron@gmail.com> | 2017-01-17 16:38:48 +0300 |
commit | bdbbb8f11edbf10add874508c5125c174d8939be (patch) | |
tree | 4807af0adc9d4db820da985d408a0a9fa465c61a /libavcodec/h264_slice.c | |
parent | adf5dc90a951bd1a94647f3e8bf79271a5e98e0e (diff) | |
parent | f450cc7bc595155bacdb9f5d2414a076ccf81b4a (diff) |
Merge commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a'
* commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a':
h264: eliminate decode_postinit()
Also includes fixes from 1f7b4f9abc and e344e65109.
Original patch replace H264Context.next_output_pic (H264Picture *) by
H264Context.output_frame (AVFrame *). This change is discarded as it
is incompatible with the frame reconstruction and motion vectors
display code which needs the extra information from the H264Picture.
Merged-by: Clément Bœsch <u@pkh.me>
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r-- | libavcodec/h264_slice.c | 106 |
1 files changed, 105 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2dc98c109c..fe71d57421 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -44,6 +44,7 @@ #include "golomb.h" #include "mathops.h" #include "mpegutils.h" +#include "mpegvideo.h" #include "rectangle.h" #include "thread.h" @@ -1283,6 +1284,105 @@ static int h264_export_frame_props(H264Context *h) return 0; } +static int h264_select_output_frame(H264Context *h) +{ + const SPS *sps = h->ps.sps; + H264Picture *out = h->cur_pic_ptr; + H264Picture *cur = h->cur_pic_ptr; + int i, pics, out_of_order, out_idx; + + cur->mmco_reset = h->mmco_reset; + h->mmco_reset = 0; + + if (sps->bitstream_restriction_flag || + h->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT) { + h->avctx->has_b_frames = FFMAX(h->avctx->has_b_frames, sps->num_reorder_frames); + } + + for (i = 0; 1; i++) { + if(i == MAX_DELAYED_PIC_COUNT || cur->poc < h->last_pocs[i]){ + if(i) + h->last_pocs[i-1] = cur->poc; + break; + } else if(i) { + h->last_pocs[i-1]= h->last_pocs[i]; + } + } + out_of_order = MAX_DELAYED_PIC_COUNT - i; + if( cur->f->pict_type == AV_PICTURE_TYPE_B + || (h->last_pocs[MAX_DELAYED_PIC_COUNT-2] > INT_MIN && h->last_pocs[MAX_DELAYED_PIC_COUNT-1] - h->last_pocs[MAX_DELAYED_PIC_COUNT-2] > 2)) + out_of_order = FFMAX(out_of_order, 1); + if (out_of_order == MAX_DELAYED_PIC_COUNT) { + av_log(h->avctx, AV_LOG_VERBOSE, "Invalid POC %d<%d\n", cur->poc, h->last_pocs[0]); + for (i = 1; i < MAX_DELAYED_PIC_COUNT; i++) + h->last_pocs[i] = INT_MIN; + h->last_pocs[0] = cur->poc; + cur->mmco_reset = 1; + } else if(h->avctx->has_b_frames < out_of_order && !sps->bitstream_restriction_flag){ + int loglevel = h->avctx->frame_number > 1 ? AV_LOG_WARNING : AV_LOG_VERBOSE; + av_log(h->avctx, loglevel, "Increasing reorder buffer to %d\n", out_of_order); + h->avctx->has_b_frames = out_of_order; + } + + pics = 0; + while (h->delayed_pic[pics]) + pics++; + + av_assert0(pics <= MAX_DELAYED_PIC_COUNT); + + h->delayed_pic[pics++] = cur; + if (cur->reference == 0) + cur->reference = DELAYED_PIC_REF; + + out = h->delayed_pic[0]; + out_idx = 0; + for (i = 1; h->delayed_pic[i] && + !h->delayed_pic[i]->f->key_frame && + !h->delayed_pic[i]->mmco_reset; + i++) + if (h->delayed_pic[i]->poc < out->poc) { + out = h->delayed_pic[i]; + out_idx = i; + } + if (h->avctx->has_b_frames == 0 && + (h->delayed_pic[0]->f->key_frame || h->delayed_pic[0]->mmco_reset)) + h->next_outputed_poc = INT_MIN; + out_of_order = out->poc < h->next_outputed_poc; + + if (out_of_order || pics > h->avctx->has_b_frames) { + out->reference &= ~DELAYED_PIC_REF; + for (i = out_idx; h->delayed_pic[i]; i++) + h->delayed_pic[i] = h->delayed_pic[i + 1]; + } + if (!out_of_order && pics > h->avctx->has_b_frames) { + h->next_output_pic = out; + if (out_idx == 0 && h->delayed_pic[0] && (h->delayed_pic[0]->f->key_frame || h->delayed_pic[0]->mmco_reset)) { + h->next_outputed_poc = INT_MIN; + } else + h->next_outputed_poc = out->poc; + + if (out->recovered) { + // We have reached an recovery point and all frames after it in + // display order are "recovered". + h->frame_recovered |= FRAME_RECOVERED_SEI; + } + out->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_SEI); + + if (!out->recovered) { + if (!(h->avctx->flags & AV_CODEC_FLAG_OUTPUT_CORRUPT) && + !(h->avctx->flags2 & AV_CODEC_FLAG2_SHOW_ALL)) { + h->next_output_pic = NULL; + } else { + out->f->flags |= AV_FRAME_FLAG_CORRUPT; + } + } + } else { + av_log(h->avctx, AV_LOG_DEBUG, "no picture %s\n", out_of_order ? "ooo" : ""); + } + + return 0; +} + /* This function is called right after decoding the slice header for a first * slice in a field (or a frame). It decides whether we are decoding a new frame * or a second field in a pair and does the necessary setup. @@ -1537,10 +1637,14 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl, /* Set the frame properties/side data. Only done for the second field in * field coded frames, since some SEI information is present for each field * and is merged by the SEI parsing code. */ - if (!FIELD_PICTURE(h) || !h->first_field) { + if (!FIELD_PICTURE(h) || !h->first_field || h->missing_fields > 1) { ret = h264_export_frame_props(h); if (ret < 0) return ret; + + ret = h264_select_output_frame(h); + if (ret < 0) + return ret; } return 0; |