comparison mpeg12.c @ 1550:fca47124001d libavcodec

mpeg2 aspect ratio encoding fixed

1549:5e643dd7e889

 
            put_bits(&s->pb, 12, s->width);
            put_bits(&s->pb, 12, s->height);
            
            for(i=1; i<15; i++){
                float error= mpeg1_aspect[i] - aspect_ratio;
                error= ABS(error);
                
                if(error < best_aspect_error){
                    best_aspect_error= error;
                    s->aspect_ratio_info= i;

    width = get_bits(&s->gb, 12);
    height = get_bits(&s->gb, 12);
    s->aspect_ratio_info= get_bits(&s->gb, 4);
    if(s->codec_id == CODEC_ID_MPEG1VIDEO){
        aspect= mpeg1_aspect[s->aspect_ratio_info];
        if(aspect!=0.0) avctx->sample_aspect_ratio= av_d2q(aspect, 30000);
    }

    s->frame_rate_index = get_bits(&s->gb, 4);
    if (s->frame_rate_index == 0)
        return -1;

1550:fca47124001d

 
            put_bits(&s->pb, 12, s->width);
            put_bits(&s->pb, 12, s->height);
            
            for(i=1; i<15; i++){
                float error= aspect_ratio;
                if(s->codec_id == CODEC_ID_MPEG1VIDEO || i <=1)
                    error-= mpeg1_aspect[i];
                else
                    error-= av_q2d(mpeg2_aspect[i])*s->height/s->width;
             
                error= ABS(error);
                
                if(error < best_aspect_error){
                    best_aspect_error= error;
                    s->aspect_ratio_info= i;

    width = get_bits(&s->gb, 12);
    height = get_bits(&s->gb, 12);
    s->aspect_ratio_info= get_bits(&s->gb, 4);
    if(s->codec_id == CODEC_ID_MPEG1VIDEO){
        aspect= mpeg1_aspect[s->aspect_ratio_info];
        if(aspect!=0.0) avctx->sample_aspect_ratio= av_d2q(aspect, 255);
    }

    s->frame_rate_index = get_bits(&s->gb, 4);
    if (s->frame_rate_index == 0)
        return -1;