comparison h264.c @ 7310:033d10927d45 libavcodec

Remove delayed_output_pic, I do not understand what this variable was good for. It is simpler and might be faster now.

7309:4d3c6cd51003

static inline int unreference_pic(H264Context *h, Picture *pic, int refmask){
    int i;
    if (pic->reference &= refmask) {
        return 0;
    } else {
        if(pic == h->delayed_output_pic)
            pic->reference=DELAYED_PIC_REF;
        else{
            for(i = 0; h->delayed_pic[i]; i++)
                if(pic == h->delayed_pic[i]){
                    pic->reference=DELAYED_PIC_REF;
                    break;
                }
        }
        return 1;
    }
}

/**

    for(i=0; i<MAX_DELAYED_PIC_COUNT; i++) {
        if(h->delayed_pic[i])
            h->delayed_pic[i]->reference= 0;
        h->delayed_pic[i]= NULL;
    }
    if(h->delayed_output_pic)
        h->delayed_output_pic->reference= 0;
    h->delayed_output_pic= NULL;
    idr(h);
    if(h->s.current_picture_ptr)
        h->s.current_picture_ptr->reference= 0;
    h->s.first_field= 0;
    ff_mpeg_flush(avctx);

    }

    if(!(s->flags2 & CODEC_FLAG2_CHUNKS) || (s->mb_y >= s->mb_height && s->mb_height)){
        Picture *out = s->current_picture_ptr;
        Picture *cur = s->current_picture_ptr;
        Picture *prev = h->delayed_output_pic;
        int i, pics, cross_idr, out_of_order, out_idx;

        s->mb_y= 0;

        s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;

                if(h->delayed_pic[i]->poc < out->poc){
                    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];
            }

            if(prev == out)
                *data_size = 0;
            else
                *data_size = sizeof(AVFrame);
            if(prev && prev != out && prev->reference == DELAYED_PIC_REF)
                prev->reference = 0;
            h->delayed_output_pic = out;
#endif

            if(out)
                *pict= *(AVFrame*)out;
            else

7310:033d10927d45

static inline int unreference_pic(H264Context *h, Picture *pic, int refmask){
    int i;
    if (pic->reference &= refmask) {
        return 0;
    } else {
            for(i = 0; h->delayed_pic[i]; i++)
                if(pic == h->delayed_pic[i]){
                    pic->reference=DELAYED_PIC_REF;
                    break;
                }
        return 1;
    }
}

/**

    for(i=0; i<MAX_DELAYED_PIC_COUNT; i++) {
        if(h->delayed_pic[i])
            h->delayed_pic[i]->reference= 0;
        h->delayed_pic[i]= NULL;
    }
    h->outputed_poc= INT_MIN;
    idr(h);
    if(h->s.current_picture_ptr)
        h->s.current_picture_ptr->reference= 0;
    h->s.first_field= 0;
    ff_mpeg_flush(avctx);

    }

    if(!(s->flags2 & CODEC_FLAG2_CHUNKS) || (s->mb_y >= s->mb_height && s->mb_height)){
        Picture *out = s->current_picture_ptr;
        Picture *cur = s->current_picture_ptr;
        int i, pics, cross_idr, out_of_order, out_idx;

        s->mb_y= 0;

        s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;

                if(h->delayed_pic[i]->poc < out->poc){
                    out = h->delayed_pic[i];
                    out_idx = i;
                }

            out_of_order = !cross_idr && out->poc < h->outputed_poc;

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

            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 && out && out->poc > h->outputed_poc + 2)
                 || cur->pict_type == FF_B_TYPE)))
            {
                s->low_delay = 0;
                s->avctx->has_b_frames++;
                out= NULL;
            }

            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];
            }

            if(out){
                *data_size = sizeof(AVFrame);

                out->reference &= ~DELAYED_PIC_REF;
                h->outputed_poc = out->poc;
            }
#endif

            if(out)
                *pict= *(AVFrame*)out;
            else