@@ -124,10 +124,10 @@ OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261.o             \

                                           mpegvideo_enc.o motion_est.o \

                                           ratecontrol.o mpeg12data.o   \

                                           mpegvideo.o

-OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o flvdec.o intelh263dec.o \

+OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o mpeg4video.o mpeg4videodec.o flvdec.o intelh263dec.o \

                                           mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_H263_VAAPI_HWACCEL)      += vaapi_mpeg4.o

-OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o      \

+OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o mpeg4video.o mpeg4videoenc.o motion_est.o      \

                                           ratecontrol.o h263.o flvenc.o mpeg12data.o \

                                           mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o h264pred.o cabac.o \

@@ -37,11 +37,12 @@

 #include "dsputil.h"

 #include "avcodec.h"

 #include "mpegvideo.h"

+#include "h263.h"

 #include "h263data.h"

-#include "mpeg4data.h"

 #include "mathops.h"

 #include "unary.h"

 #include "flv.h"

+#include "mpeg4video.h"

 //#undef NDEBUG

 //#include <assert.h>

@@ -50,26 +51,12 @@

 // reading vlc values. Changing these may improve speed and data cache needs

 // be aware though that decreasing them may need the number of stages that is

 // passed to get_vlc* to be increased.

-#define INTRA_MCBPC_VLC_BITS 6

-#define INTER_MCBPC_VLC_BITS 7

-#define CBPY_VLC_BITS 6

 #define MV_VLC_BITS 9

-#define DC_VLC_BITS 9

-#define SPRITE_TRAJ_VLC_BITS 6

-#define MB_TYPE_B_VLC_BITS 4

-#define TEX_VLC_BITS 9

 #define H263_MBTYPE_B_VLC_BITS 6

 #define CBPC_B_VLC_BITS 3

-#if CONFIG_ENCODERS

-//The uni_DCtab_* tables below contain unified bits+length tables to encode DC

-//differences in mpeg4. Unified in the sense that the specification specifies

-//this encoding in several steps.

-static uint8_t uni_DCtab_lum_len[512];

-static uint8_t uni_DCtab_chrom_len[512];

-static uint16_t uni_DCtab_lum_bits[512];

-static uint16_t uni_DCtab_chrom_bits[512];

+#if CONFIG_ENCODERS

 /**

  * Table of number of bits a motion vector component needs.

  */

@@ -88,34 +75,16 @@ static uint8_t umv_fcode_tab[MAX_MV*2+1];

 //unified encoding tables for run length encoding of coefficients

 //unified in the sense that the specification specifies the encoding in several steps.

-static uint32_t uni_mpeg4_intra_rl_bits[64*64*2*2];

-static uint8_t  uni_mpeg4_intra_rl_len [64*64*2*2];

-static uint32_t uni_mpeg4_inter_rl_bits[64*64*2*2];

-static uint8_t  uni_mpeg4_inter_rl_len [64*64*2*2];

 static uint8_t  uni_h263_intra_aic_rl_len [64*64*2*2];

 static uint8_t  uni_h263_inter_rl_len [64*64*2*2];

 //#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128 + (run)*256 + (level))

 //#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run) + (level)*64)

 #define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run)*128 + (level))

-/* mpeg4

-inter

-max level: 24/6

-max run: 53/63

-

-intra

-max level: 53/16

-max run: 29/41

-*/

 #endif

-static uint8_t static_rl_table_store[5][2][2*MAX_RUN + MAX_LEVEL + 3];

+static uint8_t static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];

-#if 0 //3IV1 is quite rare and it slows things down a tiny bit

-#define IS_3IV1 s->codec_tag == AV_RL32("3IV1")

-#else

-#define IS_3IV1 0

-#endif

 int h263_get_picture_format(int width, int height)

 {

@@ -159,13 +128,13 @@ void ff_h263_show_pict_info(MpegEncContext *s){

  * This may be one of the standard aspect ratios or it specifies

  * that the aspect will be stored explicitly later.

  */

-static av_const int aspect_to_info(AVRational aspect){

+av_const int ff_h263_aspect_to_info(AVRational aspect){

     int i;

     if(aspect.num==0) aspect= (AVRational){1,1};

     for(i=1; i<6; i++){

-        if(av_cmp_q(pixel_aspect[i], aspect) == 0){

+        if(av_cmp_q(ff_h263_pixel_aspect[i], aspect) == 0){

             return i;

         }

     }

@@ -265,7 +234,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)

                 if (format == 7) {

             /* Custom Picture Format (CPFMT) */

-            s->aspect_ratio_info= aspect_to_info(s->avctx->sample_aspect_ratio);

+            s->aspect_ratio_info= ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio);

             put_bits(&s->pb,4,s->aspect_ratio_info);

             put_bits(&s->pb,9,(s->width >> 2) - 1);

@@ -342,149 +311,6 @@ void h263_encode_gob_header(MpegEncContext * s, int mb_line)

 }

 /**

- * Returns the number of bits that encoding the 8x8 block in block would need.

- * @param[in]  block_last_index last index in scantable order that refers to a non zero element in block.

- */

-static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int block_last_index, uint8_t scantable[64]){

-    int last=0;

-    int j;

-    int rate=0;

-

-    for(j=1; j<=block_last_index; j++){

-        const int index= scantable[j];

-        int level= block[index];

-        if(level){

-            level+= 64;

-            if((level&(~127)) == 0){

-                if(j<block_last_index) rate+= s->intra_ac_vlc_length     [UNI_AC_ENC_INDEX(j-last-1, level)];

-                else                   rate+= s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j-last-1, level)];

-            }else

-                rate += s->ac_esc_length;

-

-            last= j;

-        }

-    }

-

-    return rate;

-}

-

-

-/**

- * Restores the ac coefficients in block that have been changed by decide_ac_pred().

- * This function also restores s->block_last_index.

- * @param[in,out] block MB coefficients, these will be restored

- * @param[in] dir ac prediction direction for each 8x8 block

- * @param[out] st scantable for each 8x8 block

- * @param[in] zigzag_last_index index refering to the last non zero coefficient in zigzag order

- */

-static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], const int dir[6], uint8_t *st[6], const int zigzag_last_index[6])

-{

-    int i, n;

-    memcpy(s->block_last_index, zigzag_last_index, sizeof(int)*6);

-

-    for(n=0; n<6; n++){

-        int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16;

-

-        st[n]= s->intra_scantable.permutated;

-        if(dir[n]){

-            /* top prediction */

-            for(i=1; i<8; i++){

-                block[n][s->dsp.idct_permutation[i   ]] = ac_val[i+8];

-            }

-        }else{

-            /* left prediction */

-            for(i=1; i<8; i++){

-                block[n][s->dsp.idct_permutation[i<<3]]= ac_val[i  ];

-            }

-        }

-    }

-}

-

-/**

- * Returns the optimal value (0 or 1) for the ac_pred element for the given MB in mpeg4.

- * This function will also update s->block_last_index and s->ac_val.

- * @param[in,out] block MB coefficients, these will be updated if 1 is returned

- * @param[in] dir ac prediction direction for each 8x8 block

- * @param[out] st scantable for each 8x8 block

- * @param[out] zigzag_last_index index refering to the last non zero coefficient in zigzag order

- */

-static inline int decide_ac_pred(MpegEncContext * s, DCTELEM block[6][64], const int dir[6], uint8_t *st[6], int zigzag_last_index[6])

-{

-    int score= 0;

-    int i, n;

-    int8_t * const qscale_table= s->current_picture.qscale_table;

-

-    memcpy(zigzag_last_index, s->block_last_index, sizeof(int)*6);

-

-    for(n=0; n<6; n++){

-        int16_t *ac_val, *ac_val1;

-

-        score -= get_block_rate(s, block[n], s->block_last_index[n], s->intra_scantable.permutated);

-

-        ac_val = s->ac_val[0][0] + s->block_index[n] * 16;

-        ac_val1= ac_val;

-        if(dir[n]){

-            const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride;

-            /* top prediction */

-            ac_val-= s->block_wrap[n]*16;

-            if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){

-                /* same qscale */

-                for(i=1; i<8; i++){

-                    const int level= block[n][s->dsp.idct_permutation[i   ]];

-                    block[n][s->dsp.idct_permutation[i   ]] = level - ac_val[i+8];

-                    ac_val1[i  ]=    block[n][s->dsp.idct_permutation[i<<3]];

-                    ac_val1[i+8]= level;

-                }

-            }else{

-                /* different qscale, we must rescale */

-                for(i=1; i<8; i++){

-                    const int level= block[n][s->dsp.idct_permutation[i   ]];

-                    block[n][s->dsp.idct_permutation[i   ]] = level - ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale);

-                    ac_val1[i  ]=    block[n][s->dsp.idct_permutation[i<<3]];

-                    ac_val1[i+8]= level;

-                }

-            }

-            st[n]= s->intra_h_scantable.permutated;

-        }else{

-            const int xy= s->mb_x-1 + s->mb_y*s->mb_stride;

-            /* left prediction */

-            ac_val-= 16;

-            if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){

-                /* same qscale */

-                for(i=1; i<8; i++){

-                    const int level= block[n][s->dsp.idct_permutation[i<<3]];

-                    block[n][s->dsp.idct_permutation[i<<3]]= level - ac_val[i];

-                    ac_val1[i  ]= level;

-                    ac_val1[i+8]=    block[n][s->dsp.idct_permutation[i   ]];

-                }

-            }else{

-                /* different qscale, we must rescale */

-                for(i=1; i<8; i++){

-                    const int level= block[n][s->dsp.idct_permutation[i<<3]];

-                    block[n][s->dsp.idct_permutation[i<<3]]= level - ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale);

-                    ac_val1[i  ]= level;

-                    ac_val1[i+8]=    block[n][s->dsp.idct_permutation[i   ]];

-                }

-            }

-            st[n]= s->intra_v_scantable.permutated;

-        }

-

-        for(i=63; i>0; i--) //FIXME optimize

-            if(block[n][ st[n][i] ]) break;

-        s->block_last_index[n]= i;

-

-        score += get_block_rate(s, block[n], s->block_last_index[n], st[n]);

-    }

-

-    if(score < 0){

-        return 1;

-    }else{

-        restore_ac_coeffs(s, block, dir, st, zigzag_last_index);

-        return 0;

-    }

-}

-

-/**

  * modify qscale so that encoding is acually possible in h263 (limit difference to -2..2)

  */

 void ff_clean_h263_qscales(MpegEncContext *s){

@@ -513,49 +339,12 @@ void ff_clean_h263_qscales(MpegEncContext *s){

     }

 }

-/**

- * modify mb_type & qscale so that encoding is acually possible in mpeg4

- */

-void ff_clean_mpeg4_qscales(MpegEncContext *s){

-    int i;

-    int8_t * const qscale_table= s->current_picture.qscale_table;

-

-    ff_clean_h263_qscales(s);

-

-    if(s->pict_type== FF_B_TYPE){

-        int odd=0;

-        /* ok, come on, this isn't funny anymore, there's more code for handling this mpeg4 mess than for the actual adaptive quantization */

-

-        for(i=0; i<s->mb_num; i++){

-            int mb_xy= s->mb_index2xy[i];

-            odd += qscale_table[mb_xy]&1;

-        }

-

-        if(2*odd > s->mb_num) odd=1;

-        else                  odd=0;

-

-        for(i=0; i<s->mb_num; i++){

-            int mb_xy= s->mb_index2xy[i];

-            if((qscale_table[mb_xy]&1) != odd)

-                qscale_table[mb_xy]++;

-            if(qscale_table[mb_xy] > 31)

-                qscale_table[mb_xy]= 31;

-        }

-

-        for(i=1; i<s->mb_num; i++){

-            int mb_xy= s->mb_index2xy[i];

-            if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_DIRECT)){

-                s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_BIDIR;

-            }

-        }

-    }

-}

-

 #endif //CONFIG_ENCODERS

 #define tab_size ((signed)FF_ARRAY_ELEMS(s->direct_scale_mv[0]))

 #define tab_bias (tab_size/2)

+//used by mpeg4 and rv10 decoder

 void ff_mpeg4_init_direct_mv(MpegEncContext *s){

     int i;

     for(i=0; i<tab_size; i++){

@@ -702,828 +491,10 @@ void ff_h263_update_motion_val(MpegEncContext * s){

     }

 }

-/**

- * predicts the dc.

- * encoding quantized level -> quantized diff

- * decoding quantized diff -> quantized level

- * @param n block index (0-3 are luma, 4-5 are chroma)

- * @param dir_ptr pointer to an integer where the prediction direction will be stored

- */

-static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding)

-{

-    int a, b, c, wrap, pred, scale, ret;

-    int16_t *dc_val;

-

-    /* find prediction */

-    if (n < 4) {

-        scale = s->y_dc_scale;

-    } else {

-        scale = s->c_dc_scale;

-    }

-    if(IS_3IV1)

-        scale= 8;

-

-    wrap= s->block_wrap[n];

-    dc_val = s->dc_val[0] + s->block_index[n];

-

-    /* B C

-     * A X

-     */

-    a = dc_val[ - 1];

-    b = dc_val[ - 1 - wrap];

-    c = dc_val[ - wrap];

-

-    /* outside slice handling (we can't do that by memset as we need the dc for error resilience) */

-    if(s->first_slice_line && n!=3){

-        if(n!=2) b=c= 1024;

-        if(n!=1 && s->mb_x == s->resync_mb_x) b=a= 1024;

-    }

-    if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1){

-        if(n==0 || n==4 || n==5)

-            b=1024;

-    }

-

-    if (abs(a - b) < abs(b - c)) {

-        pred = c;

-        *dir_ptr = 1; /* top */

-    } else {

-        pred = a;

-        *dir_ptr = 0; /* left */

-    }

-    /* we assume pred is positive */

-    pred = FASTDIV((pred + (scale >> 1)), scale);

-

-    if(encoding){

-        ret = level - pred;

-    }else{

-        level += pred;

-        ret= level;

-        if(s->error_recognition>=3){

-            if(level<0){

-                av_log(s->avctx, AV_LOG_ERROR, "dc<0 at %dx%d\n", s->mb_x, s->mb_y);

-                return -1;

-            }

-            if(level*scale > 2048 + scale){

-                av_log(s->avctx, AV_LOG_ERROR, "dc overflow at %dx%d\n", s->mb_x, s->mb_y);

-                return -1;

-            }

-        }

-    }

-    level *=scale;

-    if(level&(~2047)){

-        if(level<0)

-            level=0;

-        else if(!(s->workaround_bugs&FF_BUG_DC_CLIP))

-            level=2047;

-    }

-    dc_val[0]= level;

-

-    return ret;

-}

-

 #if CONFIG_ENCODERS

-/**

- * encodes the dc value.

- * @param n block index (0-3 are luma, 4-5 are chroma)

- */

-static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)

-{

-#if 1

-    level+=256;

-    if (n < 4) {

-        /* luminance */

-        put_bits(s, uni_DCtab_lum_len[level], uni_DCtab_lum_bits[level]);

-    } else {

-        /* chrominance */

-        put_bits(s, uni_DCtab_chrom_len[level], uni_DCtab_chrom_bits[level]);

-    }

-#else

-    int size, v;

-    /* find number of bits */

-    size = 0;

-    v = abs(level);

-    while (v) {

-        v >>= 1;

-        size++;

-    }

-

-    if (n < 4) {

-        /* luminance */

-        put_bits(&s->pb, DCtab_lum[size][1], DCtab_lum[size][0]);

-    } else {

-        /* chrominance */

-        put_bits(&s->pb, DCtab_chrom[size][1], DCtab_chrom[size][0]);

-    }

-

-    /* encode remaining bits */

-    if (size > 0) {

-        if (level < 0)

-            level = (-level) ^ ((1 << size) - 1);

-        put_bits(&s->pb, size, level);

-        if (size > 8)

-            put_bits(&s->pb, 1, 1);

-    }

-#endif

-}

-

-static inline int mpeg4_get_dc_length(int level, int n){

-    if (n < 4) {

-        return uni_DCtab_lum_len[level + 256];

-    } else {

-        return uni_DCtab_chrom_len[level + 256];

-    }

-}

-

-/**

- * encodes a 8x8 block

- * @param n block index (0-3 are luma, 4-5 are chroma)

- */

-static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,

-                               uint8_t *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb)

-{

-    int i, last_non_zero;

-#if 0 //variables for the outcommented version

-    int code, sign, last;

-#endif

-    const RLTable *rl;

-    uint32_t *bits_tab;

-    uint8_t *len_tab;

-    const int last_index = s->block_last_index[n];

-

-    if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away

-        /* mpeg4 based DC predictor */

-        mpeg4_encode_dc(dc_pb, intra_dc, n);

-        if(last_index<1) return;

-        i = 1;

-        rl = &rl_intra;

-        bits_tab= uni_mpeg4_intra_rl_bits;

-        len_tab = uni_mpeg4_intra_rl_len;

-    } else {

-        if(last_index<0) return;

-        i = 0;

-        rl = &rl_inter;

-        bits_tab= uni_mpeg4_inter_rl_bits;

-        len_tab = uni_mpeg4_inter_rl_len;

-    }

-

-    /* AC coefs */

-    last_non_zero = i - 1;

-#if 1

-    for (; i < last_index; i++) {

-        int level = block[ scan_table[i] ];

-        if (level) {

-            int run = i - last_non_zero - 1;

-            level+=64;

-            if((level&(~127)) == 0){

-                const int index= UNI_MPEG4_ENC_INDEX(0, run, level);

-                put_bits(ac_pb, len_tab[index], bits_tab[index]);

-            }else{ //ESC3

-                put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(0<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1);

-            }

-            last_non_zero = i;

-        }

-    }

-    /*if(i<=last_index)*/{

-        int level = block[ scan_table[i] ];

-        int run = i - last_non_zero - 1;

-        level+=64;

-        if((level&(~127)) == 0){

-            const int index= UNI_MPEG4_ENC_INDEX(1, run, level);

-            put_bits(ac_pb, len_tab[index], bits_tab[index]);

-        }else{ //ESC3

-            put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(1<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1);

-        }

-    }

-#else

-    for (; i <= last_index; i++) {

-        const int slevel = block[ scan_table[i] ];

-        if (slevel) {

-            int level;

-            int run = i - last_non_zero - 1;

-            last = (i == last_index);

-            sign = 0;

-            level = slevel;

-            if (level < 0) {

-                sign = 1;

-                level = -level;

-            }

-            code = get_rl_index(rl, last, run, level);

-            put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);

-            if (code == rl->n) {

-                int level1, run1;

-                level1 = level - rl->max_level[last][run];

-                if (level1 < 1)

-                    goto esc2;

-                code = get_rl_index(rl, last, run, level1);

-                if (code == rl->n) {

-                esc2:

-                    put_bits(ac_pb, 1, 1);

-                    if (level > MAX_LEVEL)

-                        goto esc3;

-                    run1 = run - rl->max_run[last][level] - 1;

-                    if (run1 < 0)

-                        goto esc3;

-                    code = get_rl_index(rl, last, run1, level);

-                    if (code == rl->n) {

-                    esc3:

-                        /* third escape */

-                        put_bits(ac_pb, 1, 1);

-                        put_bits(ac_pb, 1, last);

-                        put_bits(ac_pb, 6, run);

-                        put_bits(ac_pb, 1, 1);

-                        put_sbits(ac_pb, 12, slevel);

-                        put_bits(ac_pb, 1, 1);

-                    } else {

-                        /* second escape */

-                        put_bits(ac_pb, 1, 0);

-                        put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);

-                        put_bits(ac_pb, 1, sign);

-                    }

-                } else {

-                    /* first escape */

-                    put_bits(ac_pb, 1, 0);

-                    put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);

-                    put_bits(ac_pb, 1, sign);

-                }

-            } else {

-                put_bits(ac_pb, 1, sign);

-            }

-            last_non_zero = i;

-        }

-    }

-#endif

-}

-

-static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,

-                               uint8_t *scan_table)

-{

-    int i, last_non_zero;

-    uint8_t *len_tab;

-    const int last_index = s->block_last_index[n];

-    int len=0;

-

-    if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away

-        /* mpeg4 based DC predictor */

-        len += mpeg4_get_dc_length(intra_dc, n);

-        if(last_index<1) return len;

-        i = 1;

-        len_tab = uni_mpeg4_intra_rl_len;

-    } else {

-        if(last_index<0) return 0;

-        i = 0;

-        len_tab = uni_mpeg4_inter_rl_len;

-    }

-

-    /* AC coefs */

-    last_non_zero = i - 1;

-    for (; i < last_index; i++) {

-        int level = block[ scan_table[i] ];

-        if (level) {

-            int run = i - last_non_zero - 1;

-            level+=64;

-            if((level&(~127)) == 0){

-                const int index= UNI_MPEG4_ENC_INDEX(0, run, level);

-                len += len_tab[index];

-            }else{ //ESC3

-                len += 7+2+1+6+1+12+1;

-            }

-            last_non_zero = i;

-        }

-    }

-    /*if(i<=last_index)*/{

-        int level = block[ scan_table[i] ];

-        int run = i - last_non_zero - 1;

-        level+=64;

-        if((level&(~127)) == 0){

-            const int index= UNI_MPEG4_ENC_INDEX(1, run, level);

-            len += len_tab[index];

-        }else{ //ESC3

-            len += 7+2+1+6+1+12+1;

-        }

-    }

-

-    return len;

-}

-

-static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code){

-    int l, bit_size, code;

-

-    if (val == 0) {

-        return mvtab[0][1];

-    } else {

-        bit_size = f_code - 1;

-        /* modulo encoding */

-        l= INT_BIT - 6 - bit_size;

-        val = (val<<l)>>l;

-        val--;

-        code = (val >> bit_size) + 1;

-

-        return mvtab[code][1] + 1 + bit_size;

-    }

-}

-

-static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code){

-    if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){

-        skip_put_bits(&s->pb,

-            h263_get_motion_length(s, x, f_code)

-           +h263_get_motion_length(s, y, f_code));

-    }else{

-        ff_h263_encode_motion(s, x, f_code);

-        ff_h263_encode_motion(s, y, f_code);

-    }

-}

-

-static inline int get_p_cbp(MpegEncContext * s,

-                      DCTELEM block[6][64],

-                      int motion_x, int motion_y){

-    int cbp, i;

-

-    if(s->flags & CODEC_FLAG_CBP_RD){

-        int best_cbpy_score= INT_MAX;

-        int best_cbpc_score= INT_MAX;

-        int cbpc = (-1), cbpy= (-1);

-        const int offset= (s->mv_type==MV_TYPE_16X16 ? 0 : 16) + (s->dquant ? 8 : 0);

-        const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6);

-

-        for(i=0; i<4; i++){

-            int score= inter_MCBPC_bits[i + offset] * lambda;

-            if(i&1) score += s->coded_score[5];

-            if(i&2) score += s->coded_score[4];

-

-            if(score < best_cbpc_score){

-                best_cbpc_score= score;

-                cbpc= i;

-            }

-        }

-

-        for(i=0; i<16; i++){

-            int score= cbpy_tab[i ^ 0xF][1] * lambda;

-            if(i&1) score += s->coded_score[3];

-            if(i&2) score += s->coded_score[2];

-            if(i&4) score += s->coded_score[1];

-            if(i&8) score += s->coded_score[0];

-

-            if(score < best_cbpy_score){

-                best_cbpy_score= score;

-                cbpy= i;

-            }

-        }

-        cbp= cbpc + 4*cbpy;

-        if ((motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16){

-            if(best_cbpy_score + best_cbpc_score + 2*lambda >= 0)

-                cbp= 0;

-        }

-

-        for (i = 0; i < 6; i++) {

-            if (s->block_last_index[i] >= 0 && ((cbp >> (5 - i))&1)==0 ){

-                s->block_last_index[i]= -1;

-                s->dsp.clear_block(s->block[i]);

-            }

-        }

-    }else{

-        cbp= 0;

-        for (i = 0; i < 6; i++) {

-            if (s->block_last_index[i] >= 0)

-                cbp |= 1 << (5 - i);

-        }

-    }

-    return cbp;

-}

-

-static inline int get_b_cbp(MpegEncContext * s, DCTELEM block[6][64],

-                            int motion_x, int motion_y, int mb_type){

-    int cbp=0, i;

-

-    if(s->flags & CODEC_FLAG_CBP_RD){

-        int score=0;

-        const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6);

-

-        for(i=0; i<6; i++){

-            if(s->coded_score[i] < 0){

-                score += s->coded_score[i];

-                cbp |= 1 << (5 - i);

-            }

-        }

-

-        if(cbp){

-            int zero_score= -6;

-            if ((motion_x | motion_y | s->dquant | mb_type) == 0){

-                zero_score-= 4; //2*MV + mb_type + cbp bit

-            }

-

-            zero_score*= lambda;

-            if(zero_score <= score){

-                cbp=0;

-            }

-        }

-

-        for (i = 0; i < 6; i++) {

-            if (s->block_last_index[i] >= 0 && ((cbp >> (5 - i))&1)==0 ){

-                s->block_last_index[i]= -1;

-                s->dsp.clear_block(s->block[i]);

-            }

-        }

-    }else{

-        for (i = 0; i < 6; i++) {

-            if (s->block_last_index[i] >= 0)

-                cbp |= 1 << (5 - i);

-        }

-    }

-    return cbp;

-}

-

-static inline void mpeg4_encode_blocks(MpegEncContext * s, DCTELEM block[6][64], int intra_dc[6],

-                               uint8_t **scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb){

-    int i;

-

-    if(scan_table){

-        if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){

-            for (i = 0; i < 6; i++) {

-                skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, intra_dc[i], scan_table[i]));

-            }

-        }else{

-            /* encode each block */

-            for (i = 0; i < 6; i++) {

-                mpeg4_encode_block(s, block[i], i, intra_dc[i], scan_table[i], dc_pb, ac_pb);

-            }

-        }

-    }else{

-        if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){

-            for (i = 0; i < 6; i++) {

-                skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, 0, s->intra_scantable.permutated));

-            }

-        }else{

-            /* encode each block */

-            for (i = 0; i < 6; i++) {

-                mpeg4_encode_block(s, block[i], i, 0, s->intra_scantable.permutated, dc_pb, ac_pb);

-            }

-        }

-    }

-}

-

 static const int dquant_code[5]= {1,0,9,2,3};

-void mpeg4_encode_mb(MpegEncContext * s,

-                    DCTELEM block[6][64],

-                    int motion_x, int motion_y)

-{

-    int cbpc, cbpy, pred_x, pred_y;

-    PutBitContext * const pb2    = s->data_partitioning                         ? &s->pb2    : &s->pb;

-    PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=FF_B_TYPE ? &s->tex_pb : &s->pb;

-    PutBitContext * const dc_pb  = s->data_partitioning && s->pict_type!=FF_I_TYPE ? &s->pb2    : &s->pb;

-    const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0;

-

-    if (!s->mb_intra) {

-        int i, cbp;

-

-        if(s->pict_type==FF_B_TYPE){

-            static const int mb_type_table[8]= {-1, 3, 2, 1,-1,-1,-1, 0}; /* convert from mv_dir to type */

-            int mb_type=  mb_type_table[s->mv_dir];

-

-            if(s->mb_x==0){

-                for(i=0; i<2; i++){

-                    s->last_mv[i][0][0]=

-                    s->last_mv[i][0][1]=

-                    s->last_mv[i][1][0]=

-                    s->last_mv[i][1][1]= 0;

-                }

-            }

-

-            assert(s->dquant>=-2 && s->dquant<=2);

-            assert((s->dquant&1)==0);

-            assert(mb_type>=0);

-

-            /* nothing to do if this MB was skipped in the next P Frame */

-            if(s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]){ //FIXME avoid DCT & ...

-                s->skip_count++;

-                s->mv[0][0][0]=

-                s->mv[0][0][1]=

-                s->mv[1][0][0]=

-                s->mv[1][0][1]= 0;

-                s->mv_dir= MV_DIR_FORWARD; //doesn't matter

-                s->qscale -= s->dquant;

-//                s->mb_skipped=1;

-

-                return;

-            }

-

-            cbp= get_b_cbp(s, block, motion_x, motion_y, mb_type);

-

-            if ((cbp | motion_x | motion_y | mb_type) ==0) {

-                /* direct MB with MV={0,0} */

-                assert(s->dquant==0);

-

-                put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */

-

-                if(interleaved_stats){

-                    s->misc_bits++;

-                    s->last_bits++;

-                }

-                s->skip_count++;

-                return;

-            }

-

-            put_bits(&s->pb, 1, 0);     /* mb coded modb1=0 */

-            put_bits(&s->pb, 1, cbp ? 0 : 1); /* modb2 */ //FIXME merge

-            put_bits(&s->pb, mb_type+1, 1); // this table is so simple that we don't need it :)

-            if(cbp) put_bits(&s->pb, 6, cbp);

-

-            if(cbp && mb_type){

-                if(s->dquant)

-                    put_bits(&s->pb, 2, (s->dquant>>2)+3);

-                else

-                    put_bits(&s->pb, 1, 0);

-            }else

-                s->qscale -= s->dquant;

-

-            if(!s->progressive_sequence){

-                if(cbp)

-                    put_bits(&s->pb, 1, s->interlaced_dct);

-                if(mb_type) // not direct mode

-                    put_bits(&s->pb, 1, s->mv_type == MV_TYPE_FIELD);

-            }

-

-            if(interleaved_stats){

-                s->misc_bits+= get_bits_diff(s);

-            }

-

-            if(mb_type == 0){

-                assert(s->mv_dir & MV_DIRECT);

-                ff_h263_encode_motion_vector(s, motion_x, motion_y, 1);

-                s->b_count++;

-                s->f_count++;

-            }else{

-                assert(mb_type > 0 && mb_type < 4);

-                if(s->mv_type != MV_TYPE_FIELD){

-                    if(s->mv_dir & MV_DIR_FORWARD){

-                        ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0],

-                                                        s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code);

-                        s->last_mv[0][0][0]= s->last_mv[0][1][0]= s->mv[0][0][0];

-                        s->last_mv[0][0][1]= s->last_mv[0][1][1]= s->mv[0][0][1];