comparison h261.c @ 2290:89a5e4601343 libavcodec

nonsense removial

2289:5443c3fc2448

    s->codec_id= avctx->codec->id;

    h261_decode_init_vlc(h);

    h->bits_left = 0;
    h->last_bits = 0;
    h->gob_start_code_skipped = 0;
    
    return 0;
}

 * @return <0 if no startcode found
 */
int h261_decode_picture_header(H261Context *h){
    MpegEncContext * const s = &h->s;
    int format, i;
    uint32_t startcode;
    align_get_bits(&s->gb);

    startcode = (h->last_bits << (12 - (8-h->bits_left))) | get_bits(&s->gb, 20-8 - (8- h->bits_left));

    for(i= s->gb.size_in_bits - get_bits_count(&s->gb); i>24; i-=1){
        startcode = ((startcode << 1) | get_bits(&s->gb, 1)) & 0x000FFFFF;

        if(startcode == 0x10)

/**
 * returns the number of bytes consumed for building the current frame
 */
static int get_consumed_bytes(MpegEncContext *s, int buf_size){
    int pos= (get_bits_count(&s->gb)+7)>>3;

    if(s->flags&CODEC_FLAG_TRUNCATED){
        pos -= s->parse_context.last_index;
        if(pos<0) pos=0;// padding is not really read so this might be -1
        return pos;
    }else{
        if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...)
        if(pos+10>buf_size) pos=buf_size; // oops ;)

        return pos;
    }

    s->flags= avctx->flags;
    s->flags2= avctx->flags2;

    /* no supplementary picture */
    if (buf_size == 0) {

        return 0;
    }

    if(s->flags&CODEC_FLAG_TRUNCATED){
        int next;

        if(ff_h261_resync(h)<0)
            break;
        h261_decode_gob(h);
    }
    MPV_frame_end(s);

    // h261 doesn't have byte aligned codes
    // store the bits of the next frame that are left in the last byte
    // in the H261Context and remember the number of stored bits
    {
        int bitsleft;
        int current_pos= get_bits_count(&s->gb)>>3;
        bitsleft =  (current_pos<<3) - get_bits_count(&s->gb);
        h->bits_left = - bitsleft;
        if(bitsleft > 0)
            h->last_bits= get_bits(&s->gb, 8 - h->bits_left);
        else
            h->last_bits = 0;
    }

assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);
assert(s->current_picture.pict_type == s->pict_type);
    *pict= *(AVFrame*)&s->current_picture;
    ff_print_debug_info(s, pict);

2290:89a5e4601343

    s->codec_id= avctx->codec->id;

    h261_decode_init_vlc(h);

    h->gob_start_code_skipped = 0;
    
    return 0;
}

 * @return <0 if no startcode found
 */
int h261_decode_picture_header(H261Context *h){
    MpegEncContext * const s = &h->s;
    int format, i;
    uint32_t startcode= 0;

    for(i= s->gb.size_in_bits - get_bits_count(&s->gb); i>24; i-=1){
        startcode = ((startcode << 1) | get_bits(&s->gb, 1)) & 0x000FFFFF;

        if(startcode == 0x10)

/**
 * returns the number of bytes consumed for building the current frame
 */
static int get_consumed_bytes(MpegEncContext *s, int buf_size){
    if(s->flags&CODEC_FLAG_TRUNCATED){
        int pos= (get_bits_count(&s->gb)+7)>>3;
        pos -= s->parse_context.last_index;
        if(pos<0) pos=0;// padding is not really read so this might be -1
        return pos;
    }else{
        int pos= get_bits_count(&s->gb)>>3;
        if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...)
        if(pos+10>buf_size) pos=buf_size; // oops ;)

        return pos;
    }

    s->flags= avctx->flags;
    s->flags2= avctx->flags2;

    /* no supplementary picture */
    if (buf_size == 0) {
        return 0;
    }

    if(s->flags&CODEC_FLAG_TRUNCATED){
        int next;

        if(ff_h261_resync(h)<0)
            break;
        h261_decode_gob(h);
    }
    MPV_frame_end(s);

assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);
assert(s->current_picture.pict_type == s->pict_type);
    *pict= *(AVFrame*)&s->current_picture;
    ff_print_debug_info(s, pict);