comparison rv10.c @ 646:f87dc45d921d libavcodec

fixing rv10 encoding (ffmpeg can at least decode its own rv10 files now)

645:f53e17dec13f

}

/* write RV 1.0 compatible frame header */
void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
{
    align_put_bits(&s->pb);

    put_bits(&s->pb, 1, 1);	/* marker */

    put_bits(&s->pb, 1, (s->pict_type == P_TYPE));

    put_bits(&s->pb, 1, 0);	/* not PB frame */

    if (s->pict_type == I_TYPE) {
	/* specific MPEG like DC coding not used */
    }
    /* if multiple packets per frame are sent, the position at which
       to display the macro blocks is coded here */
    put_bits(&s->pb, 6, 0);	/* mb_x */
    put_bits(&s->pb, 6, 0);	/* mb_y */
    put_bits(&s->pb, 12, s->mb_width * s->mb_height);

    put_bits(&s->pb, 3, 0);	/* ignored */
}

static int get_num(GetBitContext *gb)

646:f87dc45d921d

}

/* write RV 1.0 compatible frame header */
void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
{
    int full_frame= 1;

    align_put_bits(&s->pb);
    
    if(full_frame){
        put_bits(&s->pb, 8, 0xc0);	/* packet header */
        put_bits(&s->pb, 16, 0x4000);	/* len */
        put_bits(&s->pb, 16, 0x4000);	/* pos */
    }

    put_bits(&s->pb, 8, picture_number&0xFF);
    
    put_bits(&s->pb, 1, 1);	/* marker */

    put_bits(&s->pb, 1, (s->pict_type == P_TYPE));

    put_bits(&s->pb, 1, 0);	/* not PB frame */

    if (s->pict_type == I_TYPE) {
	/* specific MPEG like DC coding not used */
    }
    /* if multiple packets per frame are sent, the position at which
       to display the macro blocks is coded here */
    if(!full_frame){
        put_bits(&s->pb, 6, 0);	/* mb_x */
        put_bits(&s->pb, 6, 0);	/* mb_y */
        put_bits(&s->pb, 12, s->mb_width * s->mb_height);
    }

    put_bits(&s->pb, 3, 0);	/* ignored */
}

static int get_num(GetBitContext *gb)