comparison h264.c @ 7309:4d3c6cd51003 libavcodec

Drop out of order pics even if bitstream_restriction_flag is set.

7308:29319d07aeb4

                    out = h->delayed_pic[i];
                    out_idx = i;
                }

            out_of_order = !cross_idr && prev && out->poc < prev->poc;
            if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
                { }
            else if(prev && pics <= s->avctx->has_b_frames)
                out = prev;
            else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
               || (s->low_delay &&
                ((!cross_idr && prev && out->poc > prev->poc + 2)
                 || cur->pict_type == FF_B_TYPE)))
            {
                s->low_delay = 0;
                s->avctx->has_b_frames++;
                out = prev;
            }
            else if(out_of_order)
                out = prev;

            if(out_of_order || pics > s->avctx->has_b_frames){
                for(i=out_idx; h->delayed_pic[i]; i++)
                    h->delayed_pic[i] = h->delayed_pic[i+1];
            }

7309:4d3c6cd51003

                    out = h->delayed_pic[i];
                    out_idx = i;
                }

            out_of_order = !cross_idr && prev && out->poc < prev->poc;

            if(prev && pics <= s->avctx->has_b_frames || out_of_order)
                out = prev;

            if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
                { }
            else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
               || (s->low_delay &&
                ((!cross_idr && prev && out->poc > prev->poc + 2)
                 || cur->pict_type == FF_B_TYPE)))
            {
                s->low_delay = 0;
                s->avctx->has_b_frames++;
                out = prev;
            }

            if(out_of_order || pics > s->avctx->has_b_frames){
                for(i=out_idx; h->delayed_pic[i]; i++)
                    h->delayed_pic[i] = h->delayed_pic[i+1];
            }