comparison h264.c @ 5803:f896159a1a9e libavcodec

reindent

5802:d112d5c13ae8

    first_mb_in_slice= get_ue_golomb(&s->gb);

    if((s->flags2 & CODEC_FLAG2_CHUNKS) && first_mb_in_slice == 0){
        h0->current_slice = 0;
        if (!s0->first_field)
        s->current_picture_ptr= NULL;
    }

    slice_type= get_ue_golomb(&s->gb);
    if(slice_type > 9){
        av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y);

    }
#endif
    if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
        h->current_slice = 0;
        if (!s->first_field)
        s->current_picture_ptr= NULL;
    }

    for(;;){
        int consumed;
        int dst_length;

         * INT_MAX when called for bottom field, because mb_y is
         * past end by one (callers fault) and resync_mb_y != 0
         * causes problems for the first MB line, too.
         */
        if (!FIELD_PICTURE)
        ff_er_frame_end(s);

        MPV_frame_end(s);

        if (s->first_field) {
            /* Wait for second field. */
            *data_size = 0;

        } else {
    //FIXME do something with unavailable reference frames

#if 0 //decode order
        *data_size = sizeof(AVFrame);
#else
        /* Sort B-frames into display order */

        if(h->sps.bitstream_restriction_flag
           && s->avctx->has_b_frames < h->sps.num_reorder_frames){
            s->avctx->has_b_frames = h->sps.num_reorder_frames;
            s->low_delay = 0;
        }

        pics = 0;
        while(h->delayed_pic[pics]) pics++;

        assert(pics+1 < sizeof(h->delayed_pic) / sizeof(h->delayed_pic[0]));

        h->delayed_pic[pics++] = cur;
        if(cur->reference == 0)
            cur->reference = DELAYED_PIC_REF;

        cross_idr = 0;
        for(i=0; h->delayed_pic[i]; i++)
            if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0)
                cross_idr = 1;

        out = h->delayed_pic[0];
        out_idx = 0;
        for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
            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(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 == 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];
        }

        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
            av_log(avctx, AV_LOG_DEBUG, "no picture\n");
        }
    }

    assert(pict->data[0] || !*data_size);
    ff_print_debug_info(s, pict);

5803:f896159a1a9e

    first_mb_in_slice= get_ue_golomb(&s->gb);

    if((s->flags2 & CODEC_FLAG2_CHUNKS) && first_mb_in_slice == 0){
        h0->current_slice = 0;
        if (!s0->first_field)
            s->current_picture_ptr= NULL;
    }

    slice_type= get_ue_golomb(&s->gb);
    if(slice_type > 9){
        av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y);

    }
#endif
    if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
        h->current_slice = 0;
        if (!s->first_field)
            s->current_picture_ptr= NULL;
    }

    for(;;){
        int consumed;
        int dst_length;

         * INT_MAX when called for bottom field, because mb_y is
         * past end by one (callers fault) and resync_mb_y != 0
         * causes problems for the first MB line, too.
         */
        if (!FIELD_PICTURE)
            ff_er_frame_end(s);

        MPV_frame_end(s);

        if (s->first_field) {
            /* Wait for second field. */
            *data_size = 0;

        } else {
        //FIXME do something with unavailable reference frames

#if 0 //decode order
            *data_size = sizeof(AVFrame);
#else
            /* Sort B-frames into display order */

            if(h->sps.bitstream_restriction_flag
               && s->avctx->has_b_frames < h->sps.num_reorder_frames){
                s->avctx->has_b_frames = h->sps.num_reorder_frames;
                s->low_delay = 0;
            }

            pics = 0;
            while(h->delayed_pic[pics]) pics++;

            assert(pics+1 < sizeof(h->delayed_pic) / sizeof(h->delayed_pic[0]));

            h->delayed_pic[pics++] = cur;
            if(cur->reference == 0)
                cur->reference = DELAYED_PIC_REF;

            cross_idr = 0;
            for(i=0; h->delayed_pic[i]; i++)
                if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0)
                    cross_idr = 1;

            out = h->delayed_pic[0];
            out_idx = 0;
            for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
                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(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 == 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];
            }

            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
                av_log(avctx, AV_LOG_DEBUG, "no picture\n");
        }
    }

    assert(pict->data[0] || !*data_size);
    ff_print_debug_info(s, pict);