comparison h264.c @ 2410:9d780478f8a5 libavcodec

reduce stutter if we learn too late that the stream contains B-frames.

2409:26778a857b5b

         * FIXME doesn't allow for multiple delayed frames */
        Picture *cur = s->current_picture_ptr;
        Picture *prev = h->delayed_pic[0];
        Picture *out;

        if(cur->pict_type == B_TYPE
           || (!h->sps.gaps_in_frame_num_allowed_flag
               && prev && cur->poc - prev->poc > 2)){
            s->low_delay = 0;
            s->avctx->has_b_frames = 1;
        }

        if(s->low_delay || !prev || cur->pict_type == B_TYPE)
            out = cur;
        else{
            out = prev;
            if(prev->reference == 1)
                prev->reference = 0;
        }
        if(!s->low_delay && (!prev || out == prev))
            h->delayed_pic[0] = cur;

        *pict= *(AVFrame*)out;
    }

    ff_print_debug_info(s, pict);

2410:9d780478f8a5

         * FIXME doesn't allow for multiple delayed frames */
        Picture *cur = s->current_picture_ptr;
        Picture *prev = h->delayed_pic[0];
        Picture *out;

        if(s->low_delay
           && (cur->pict_type == B_TYPE
           || (!h->sps.gaps_in_frame_num_allowed_flag
               && prev && cur->poc - prev->poc > 2))){
            s->low_delay = 0;
            s->avctx->has_b_frames = 1;
            if(prev && prev->poc > cur->poc)
                // too late to display this frame
                cur = prev;
        }

        if(s->low_delay || !prev || cur->pict_type == B_TYPE)
            out = cur;
        else
            out = prev;
        if(s->low_delay || !prev || out == prev){
            if(prev && prev->reference == 1)
                prev->reference = 0;
            h->delayed_pic[0] = cur;
        }

        *pict= *(AVFrame*)out;
    }

    ff_print_debug_info(s, pict);