comparison mpegvideo.c @ 239:16cd8a9c4da4 libavcodec

- Minor changes on bitrate control

238:99a9f903f0e3

        }
    }
    
    if (s->encoding) {
        /* Allocate MB type table */
        s->mb_type = malloc(s->mb_num * sizeof(char));
        if (s->mb_type == NULL) {
            perror("malloc");
            goto fail;
        }
    
        /* Allocate MV table */
        /* By now we just have one MV per MB */
        s->mv_table[0] = malloc(s->mb_num * sizeof(INT16));
        s->mv_table[1] = malloc(s->mb_num * sizeof(INT16));
        if (s->mv_table[1] == NULL || s->mv_table[0] == NULL) {
            perror("malloc");
            goto fail;
        }
    }

    s->context_initialized = 1;
    return 0;
 fail:
    if (s->mb_type)
        free(s->mb_type);
    if (s->mv_table[0])
        free(s->mv_table[0]);
    if (s->mv_table[1])
        free(s->mv_table[1]);
    if (s->motion_val)

{
    int i;

    if (s->mb_type)
        free(s->mb_type);
    if (s->mv_table[0])
        free(s->mv_table[0]);
    if (s->mv_table[1])
        free(s->mv_table[1]);
    if (s->motion_val)

                sub_pixels_2(s->block[4], ptr, s->linesize >> 1, dxy);
                ptr = s->last_picture[2] + offset;
                sub_pixels_2(s->block[5], ptr, s->linesize >> 1, dxy);
            }
            emms_c();

            /* DCT & quantize */
            if (s->h263_msmpeg4) {
                msmpeg4_dc_scale(s);
            } else if (s->h263_pred) {
                h263_dc_scale(s);

239:16cd8a9c4da4

        }
    }
    
    if (s->encoding) {
        /* Allocate MB type table */
        s->mb_type = av_mallocz(s->mb_num * sizeof(char));
        if (s->mb_type == NULL) {
            perror("malloc");
            goto fail;
        }
        
        s->mb_var = av_mallocz(s->mb_num * sizeof(INT16));
        if (s->mb_var == NULL) {
            perror("malloc");
            goto fail;
        }
        /* Allocate MV table */
        /* By now we just have one MV per MB */
        s->mv_table[0] = av_mallocz(s->mb_num * sizeof(INT16));
        s->mv_table[1] = av_mallocz(s->mb_num * sizeof(INT16));
        if (s->mv_table[1] == NULL || s->mv_table[0] == NULL) {
            perror("malloc");
            goto fail;
        }
    }

    s->context_initialized = 1;
    return 0;
 fail:
    if (s->mb_type)
        free(s->mb_type);
    if (s->mb_var)
        free(s->mb_var);
    if (s->mv_table[0])
        free(s->mv_table[0]);
    if (s->mv_table[1])
        free(s->mv_table[1]);
    if (s->motion_val)

{
    int i;

    if (s->mb_type)
        free(s->mb_type);
    if (s->mb_var)
        free(s->mb_var);
    if (s->mv_table[0])
        free(s->mv_table[0]);
    if (s->mv_table[1])
        free(s->mv_table[1]);
    if (s->motion_val)

                sub_pixels_2(s->block[4], ptr, s->linesize >> 1, dxy);
                ptr = s->last_picture[2] + offset;
                sub_pixels_2(s->block[5], ptr, s->linesize >> 1, dxy);
            }
            emms_c();
            //if (s->avg_mb_var)
            //    printf("\nqscale=%2d dquant=%2d var=%4d avgvar=%4d", s->qscale,
            //        s->qscale*(s->mb_var[s->mb_width*mb_y+mb_x]/s->avg_mb_var),
            //        s->mb_var[s->mb_width*mb_y+mb_x], s->avg_mb_var);
            /* DCT & quantize */
            if (s->h263_msmpeg4) {
                msmpeg4_dc_scale(s);
            } else if (s->h263_pred) {
                h263_dc_scale(s);