comparison msmpeg4.c @ 195:92f726205082 libavcodec

s->c_dc_scale was 7 if s->qscale==2 but should be 8 (the bug is visible in deep red areas in high bitrate clips) - patch by Michael Niedermayer <[e-mail]>

194:27d1773552c9

/* strongly inspirated from MPEG4, but not exactly the same ! */
void msmpeg4_dc_scale(MpegEncContext * s)
{
    int scale;

    if (s->qscale < 5)
        scale = 8;
    else if (s->qscale < 9)
        scale = 2 * s->qscale;
    else 
        scale = s->qscale + 8;
    s->y_dc_scale = scale;
    s->c_dc_scale = (s->qscale + 13) / 2;
}

/* dir = 0: left, dir = 1: top prediction */
static int msmpeg4_pred_dc(MpegEncContext * s, int n, 
                           INT16 **dc_val_ptr, int *dir_ptr)

195:92f726205082

/* strongly inspirated from MPEG4, but not exactly the same ! */
void msmpeg4_dc_scale(MpegEncContext * s)
{
    if (s->qscale < 5){
        s->y_dc_scale = 8;
        s->c_dc_scale = 8;
//        s->c_dc_scale = (s->qscale + 13)>>1;
    }else if (s->qscale < 9){
        s->y_dc_scale = 2 * s->qscale;
        s->c_dc_scale = (s->qscale + 13)>>1;
    }else{
        s->y_dc_scale = s->qscale + 8;
        s->c_dc_scale = (s->qscale + 13)>>1;
    }
    // this differs for quant >24 from mpeg4 
    
//    if(s->qscale==13) s->c_dc_scale=14;
    
//    if(s->qscale>=6)
//     printf("%d", s->qscale);
    
    /* s->c_dc_scale values (found by Michael Nidermayer)
     qscale=2 -> 8 (yes iam sure about that)
     qscale=3 -> 8
     qscale=4 -> 8
     qscale=5 -> 9
     qscale=6 -> 9 
     qscale=7 -> 10
     qscale=8 -> 10
     qscale=9 -> 11
     qscale=10-> 11
    */
}

/* dir = 0: left, dir = 1: top prediction */
static int msmpeg4_pred_dc(MpegEncContext * s, int n, 
                           INT16 **dc_val_ptr, int *dir_ptr)