@@ -124,11 +124,11 @@ 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 mpeg4video.o mpeg4videodec.o flvdec.o intelh263dec.o \

+OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o ituh263dec.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 mpeg4video.o mpeg4videoenc.o motion_est.o      \

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

+                                          ratecontrol.o h263.o ituh263enc.o flvenc.o mpeg12data.o \

                                           mpegvideo.o error_resilience.o

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

                                           mpegvideo.o error_resilience.o

@@ -18,6 +18,7 @@

  */

 #include "mpegvideo.h"

+#include "h263.h"

 #include "flv.h"

 void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last){

@@ -18,6 +18,7 @@

  */

 #include "mpegvideo.h"

+#include "h263.h"

 #include "flv.h"

 void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number)

@@ -5,10 +5,6 @@

  * Copyright (c) 2001 Juan J. Sierralta P

  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>

  *

- * ac prediction encoding, B-frame support, error resilience, optimizations,

- * qpel decoding, gmc decoding, interlaced decoding

- * by Michael Niedermayer <michaelni@gmx.at>

- *

  * This file is part of FFmpeg.

  *

  * FFmpeg is free software; you can redistribute it and/or

@@ -47,299 +43,8 @@

 //#undef NDEBUG

 //#include <assert.h>

-// The defines below define the number of bits that are read at once for

-// 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 MV_VLC_BITS 9

-#define H263_MBTYPE_B_VLC_BITS 6

-#define CBPC_B_VLC_BITS 3

-

-

-#if CONFIG_ENCODERS

-/**

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

- */

-static uint8_t mv_penalty[MAX_FCODE+1][MAX_MV*2+1];

-

-/**

- * Minimal fcode that a motion vector component would need.

- */

-static uint8_t fcode_tab[MAX_MV*2+1];

-

-/**

- * Minimal fcode that a motion vector component would need in umv.

- * All entries in this table are 1.

- */

-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 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))

-

-#endif

-

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

-

-

-int h263_get_picture_format(int width, int height)

-{

-    if (width == 128 && height == 96)

-        return 1;

-    else if (width == 176 && height == 144)

-        return 2;

-    else if (width == 352 && height == 288)

-        return 3;

-    else if (width == 704 && height == 576)

-        return 4;

-    else if (width == 1408 && height == 1152)

-        return 5;

-    else

-        return 7;

-}

-

-void ff_h263_show_pict_info(MpegEncContext *s){

-    if(s->avctx->debug&FF_DEBUG_PICT_INFO){

-    av_log(s->avctx, AV_LOG_DEBUG, "qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s%s %d/%d\n",

-         s->qscale, av_get_pict_type_char(s->pict_type),

-         s->gb.size_in_bits, 1-s->no_rounding,

-         s->obmc ? " AP" : "",

-         s->umvplus ? " UMV" : "",

-         s->h263_long_vectors ? " LONG" : "",

-         s->h263_plus ? " +" : "",

-         s->h263_aic ? " AIC" : "",

-         s->alt_inter_vlc ? " AIV" : "",

-         s->modified_quant ? " MQ" : "",

-         s->loop_filter ? " LOOP" : "",

-         s->h263_slice_structured ? " SS" : "",

-         s->avctx->time_base.den, s->avctx->time_base.num

-    );

-    }

-}

-

-#if CONFIG_ENCODERS

-

-/**

- * Returns the 4 bit value that specifies the given aspect ratio.

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

- * that the aspect will be stored explicitly later.

- */

-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(ff_h263_pixel_aspect[i], aspect) == 0){

-            return i;

-        }

-    }

-

-    return FF_ASPECT_EXTENDED;

-}

-

-void h263_encode_picture_header(MpegEncContext * s, int picture_number)

-{

-    int format, coded_frame_rate, coded_frame_rate_base, i, temp_ref;

-    int best_clock_code=1;

-    int best_divisor=60;

-    int best_error= INT_MAX;

-

-    if(s->h263_plus){

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

-            int div, error;

-            div= (s->avctx->time_base.num*1800000LL + 500LL*s->avctx->time_base.den) / ((1000LL+i)*s->avctx->time_base.den);

-            div= av_clip(div, 1, 127);

-            error= FFABS(s->avctx->time_base.num*1800000LL - (1000LL+i)*s->avctx->time_base.den*div);

-            if(error < best_error){

-                best_error= error;

-                best_divisor= div;

-                best_clock_code= i;

-            }

-        }

-    }

-    s->custom_pcf= best_clock_code!=1 || best_divisor!=60;

-    coded_frame_rate= 1800000;

-    coded_frame_rate_base= (1000+best_clock_code)*best_divisor;

-

-    align_put_bits(&s->pb);

-

-    /* Update the pointer to last GOB */

-    s->ptr_lastgob = put_bits_ptr(&s->pb);

-    put_bits(&s->pb, 22, 0x20); /* PSC */

-    temp_ref= s->picture_number * (int64_t)coded_frame_rate * s->avctx->time_base.num / //FIXME use timestamp

-                         (coded_frame_rate_base * (int64_t)s->avctx->time_base.den);

-    put_sbits(&s->pb, 8, temp_ref); /* TemporalReference */

-

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

-    put_bits(&s->pb, 1, 0);     /* h263 id */

-    put_bits(&s->pb, 1, 0);     /* split screen off */

-    put_bits(&s->pb, 1, 0);     /* camera  off */

-    put_bits(&s->pb, 1, 0);     /* freeze picture release off */

-

-    format = h263_get_picture_format(s->width, s->height);

-    if (!s->h263_plus) {

-        /* H.263v1 */

-        put_bits(&s->pb, 3, format);

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

-        /* By now UMV IS DISABLED ON H.263v1, since the restrictions

-        of H.263v1 UMV implies to check the predicted MV after

-        calculation of the current MB to see if we're on the limits */

-        put_bits(&s->pb, 1, 0);         /* Unrestricted Motion Vector: off */

-        put_bits(&s->pb, 1, 0);         /* SAC: off */

-        put_bits(&s->pb, 1, s->obmc);   /* Advanced Prediction */

-        put_bits(&s->pb, 1, 0);         /* only I/P frames, no PB frame */

-        put_bits(&s->pb, 5, s->qscale);

-        put_bits(&s->pb, 1, 0);         /* Continuous Presence Multipoint mode: off */

-    } else {

-        int ufep=1;

-        /* H.263v2 */

-        /* H.263 Plus PTYPE */

-

-        put_bits(&s->pb, 3, 7);

-        put_bits(&s->pb,3,ufep); /* Update Full Extended PTYPE */

-        if (format == 7)

-            put_bits(&s->pb,3,6); /* Custom Source Format */

-        else

-            put_bits(&s->pb, 3, format);

-

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

-        put_bits(&s->pb,1, s->umvplus); /* Unrestricted Motion Vector */

-        put_bits(&s->pb,1,0); /* SAC: off */

-        put_bits(&s->pb,1,s->obmc); /* Advanced Prediction Mode */

-        put_bits(&s->pb,1,s->h263_aic); /* Advanced Intra Coding */

-        put_bits(&s->pb,1,s->loop_filter); /* Deblocking Filter */

-        put_bits(&s->pb,1,s->h263_slice_structured); /* Slice Structured */

-        put_bits(&s->pb,1,0); /* Reference Picture Selection: off */

-        put_bits(&s->pb,1,0); /* Independent Segment Decoding: off */

-        put_bits(&s->pb,1,s->alt_inter_vlc); /* Alternative Inter VLC */

-        put_bits(&s->pb,1,s->modified_quant); /* Modified Quantization: */

-        put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */

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

-

-        put_bits(&s->pb, 3, s->pict_type == FF_P_TYPE);

-

-        put_bits(&s->pb,1,0); /* Reference Picture Resampling: off */

-        put_bits(&s->pb,1,0); /* Reduced-Resolution Update: off */

-        put_bits(&s->pb,1,s->no_rounding); /* Rounding Type */

-        put_bits(&s->pb,2,0); /* Reserved */

-        put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */

+uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];

-        /* This should be here if PLUSPTYPE */

-        put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */

-

-                if (format == 7) {

-            /* Custom Picture Format (CPFMT) */

-            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);

-            put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */

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

-            if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){

-                put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num);

-                put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den);

-            }

-        }

-        if(s->custom_pcf){

-            if(ufep){

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

-                put_bits(&s->pb, 7, best_divisor);

-            }

-            put_sbits(&s->pb, 2, temp_ref>>8);

-        }

-

-        /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */

-        if (s->umvplus)

-//            put_bits(&s->pb,1,1); /* Limited according tables of Annex D */

-//FIXME check actual requested range

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

-        if(s->h263_slice_structured)

-            put_bits(&s->pb,2,0); /* no weird submodes */

-

-        put_bits(&s->pb, 5, s->qscale);

-    }

-

-    put_bits(&s->pb, 1, 0);     /* no PEI */

-

-    if(s->h263_slice_structured){

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

-

-        assert(s->mb_x == 0 && s->mb_y == 0);

-        ff_h263_encode_mba(s);

-

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

-    }

-

-    if(s->h263_aic){

-         s->y_dc_scale_table=

-         s->c_dc_scale_table= ff_aic_dc_scale_table;

-    }else{

-        s->y_dc_scale_table=

-        s->c_dc_scale_table= ff_mpeg1_dc_scale_table;

-    }

-}

-

-/**

- * Encodes a group of blocks header.

- */

-void h263_encode_gob_header(MpegEncContext * s, int mb_line)

-{

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

-

-    if(s->h263_slice_structured){

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

-

-        ff_h263_encode_mba(s);

-

-        if(s->mb_num > 1583)

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

-        put_bits(&s->pb, 5, s->qscale); /* GQUANT */

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

-        put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */

-    }else{

-        int gob_number= mb_line / s->gob_index;

-

-        put_bits(&s->pb, 5, gob_number); /* GN */

-        put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */

-        put_bits(&s->pb, 5, s->qscale); /* GQUANT */

-    }

-}

-

-/**

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

- */

-void ff_clean_h263_qscales(MpegEncContext *s){

-    int i;

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

-

-    ff_init_qscale_tab(s);

-

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

-        if(qscale_table[ s->mb_index2xy[i] ] - qscale_table[ s->mb_index2xy[i-1] ] >2)

-            qscale_table[ s->mb_index2xy[i] ]= qscale_table[ s->mb_index2xy[i-1] ]+2;

-    }

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

-        if(qscale_table[ s->mb_index2xy[i] ] - qscale_table[ s->mb_index2xy[i+1] ] >2)

-            qscale_table[ s->mb_index2xy[i] ]= qscale_table[ s->mb_index2xy[i+1] ]+2;

-    }

-

-    if(s->codec_id != CODEC_ID_H263P){

-        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_INTER4V)){

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

-            }

-        }

-    }

-}

-

-#endif //CONFIG_ENCODERS

 void ff_h263_update_motion_val(MpegEncContext * s){

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

@@ -393,164 +98,7 @@ void ff_h263_update_motion_val(MpegEncContext * s){

     }

 }

-#if CONFIG_ENCODERS

-

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

-

-/**

- * encodes a 8x8 block.

- * @param block the 8x8 block

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

- */

-static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n)

-{

-    int level, run, last, i, j, last_index, last_non_zero, sign, slevel, code;

-    RLTable *rl;

-

-    rl = &ff_h263_rl_inter;

-    if (s->mb_intra && !s->h263_aic) {

-        /* DC coef */

-        level = block[0];

-        /* 255 cannot be represented, so we clamp */

-        if (level > 254) {

-            level = 254;

-            block[0] = 254;

-        }

-        /* 0 cannot be represented also */

-        else if (level < 1) {

-            level = 1;

-            block[0] = 1;

-        }

-        if (level == 128) //FIXME check rv10

-            put_bits(&s->pb, 8, 0xff);

-        else

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

-        i = 1;

-    } else {

-        i = 0;

-        if (s->h263_aic && s->mb_intra)

-            rl = &rl_intra_aic;

-

-        if(s->alt_inter_vlc && !s->mb_intra){

-            int aic_vlc_bits=0;

-            int inter_vlc_bits=0;

-            int wrong_pos=-1;

-            int aic_code;

-

-            last_index = s->block_last_index[n];

-            last_non_zero = i - 1;

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

-                j = s->intra_scantable.permutated[i];

-                level = block[j];

-                if (level) {

-                    run = i - last_non_zero - 1;

-                    last = (i == last_index);

-

-                    if(level<0) level= -level;

-

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

-                    aic_code = get_rl_index(&rl_intra_aic, last, run, level);

-                    inter_vlc_bits += rl->table_vlc[code][1]+1;

-                    aic_vlc_bits   += rl_intra_aic.table_vlc[aic_code][1]+1;

-

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

-                        inter_vlc_bits += 1+6+8-1;

-                    }

-                    if (aic_code == rl_intra_aic.n) {

-                        aic_vlc_bits += 1+6+8-1;

-                        wrong_pos += run + 1;

-                    }else

-                        wrong_pos += wrong_run[aic_code];

-                    last_non_zero = i;

-                }

-            }

-            i = 0;

-            if(aic_vlc_bits < inter_vlc_bits && wrong_pos > 63)

-                rl = &rl_intra_aic;

-        }

-    }

-

-    /* AC coefs */

-    last_index = s->block_last_index[n];

-    last_non_zero = i - 1;

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

-        j = s->intra_scantable.permutated[i];

-        level = block[j];

-        if (level) {

-            run = i - last_non_zero - 1;

-            last = (i == last_index);

-            sign = 0;

-            slevel = level;

-            if (level < 0) {

-                sign = 1;

-                level = -level;

-            }

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

-            put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);

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

-              if(!CONFIG_FLV_ENCODER || s->h263_flv <= 1){

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

-                put_bits(&s->pb, 6, run);

-

-                assert(slevel != 0);

-

-                if(level < 128)

-                    put_sbits(&s->pb, 8, slevel);

-                else{

-                    put_bits(&s->pb, 8, 128);

-                    put_sbits(&s->pb, 5, slevel);

-                    put_sbits(&s->pb, 6, slevel>>5);

-                }

-              }else{

-                    ff_flv2_encode_ac_esc(&s->pb, slevel, level, run, last);

-              }

-            } else {

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

-            }

-            last_non_zero = i;

-        }

-    }

-}

-

-/* Encode MV differences on H.263+ with Unrestricted MV mode */

-static void h263p_encode_umotion(MpegEncContext * s, int val)

-{

-    short sval = 0;

-    short i = 0;

-    short n_bits = 0;

-    short temp_val;

-    int code = 0;

-    int tcode;

-

-    if ( val == 0)

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

-    else if (val == 1)

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

-    else if (val == -1)

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

-    else {

-

-        sval = ((val < 0) ? (short)(-val):(short)val);

-        temp_val = sval;

-

-        while (temp_val != 0) {

-            temp_val = temp_val >> 1;

-            n_bits++;

-        }

-

-        i = n_bits - 1;

-        while (i > 0) {

-            tcode = (sval & (1 << (i-1))) >> (i-1);

-            tcode = (tcode << 1) | 1;

-            code = (code << 2) | tcode;

-            i--;

-        }

-        code = ((code << 1) | (val < 0)) << 1;

-        put_bits(&s->pb, (2*n_bits)+1, code);

-    }

-}

-

-static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr)

+int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr)

 {

     int x, y, wrap, a, c, pred_dc;

     int16_t *dc_val;

@@ -591,208 +139,6 @@ static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr)

     return pred_dc;

 }

-void h263_encode_mb(MpegEncContext * s,

-                    DCTELEM block[6][64],

-                    int motion_x, int motion_y)

-{

-    int cbpc, cbpy, i, cbp, pred_x, pred_y;

-    int16_t pred_dc;

-    int16_t rec_intradc[6];

-    int16_t *dc_ptr[6];

-    const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1);

-

-    if (!s->mb_intra) {

-        /* compute cbp */

-        cbp= get_p_cbp(s, block, motion_x, motion_y);

-

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

-            /* skip macroblock */

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

-            if(interleaved_stats){

-                s->misc_bits++;

-                s->last_bits++;

-            }

-            s->skip_count++;

-

-            return;

-        }

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

-

-        cbpc = cbp & 3;

-        cbpy = cbp >> 2;

-        if(s->alt_inter_vlc==0 || cbpc!=3)

-            cbpy ^= 0xF;

-        if(s->dquant) cbpc+= 8;

-        if(s->mv_type==MV_TYPE_16X16){

-            put_bits(&s->pb,

-                    ff_h263_inter_MCBPC_bits[cbpc],

-                    ff_h263_inter_MCBPC_code[cbpc]);

-

-            put_bits(&s->pb, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);

-            if(s->dquant)

-                put_bits(&s->pb, 2, dquant_code[s->dquant+2]);

-

-            if(interleaved_stats){

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

-            }

-

-            /* motion vectors: 16x16 mode */

-            h263_pred_motion(s, 0, 0, &pred_x, &pred_y);

-

-            if (!s->umvplus) {

-                ff_h263_encode_motion_vector(s, motion_x - pred_x,

-                                                motion_y - pred_y, 1);

-            }

-            else {

-                h263p_encode_umotion(s, motion_x - pred_x);

-                h263p_encode_umotion(s, motion_y - pred_y);

-                if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1))

-                    /* To prevent Start Code emulation */

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

-            }

-        }else{

-            put_bits(&s->pb,

-                    ff_h263_inter_MCBPC_bits[cbpc+16],

-                    ff_h263_inter_MCBPC_code[cbpc+16]);

-            put_bits(&s->pb, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);

-            if(s->dquant)

-                put_bits(&s->pb, 2, dquant_code[s->dquant+2]);

-

-            if(interleaved_stats){

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

-            }

-

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

-                /* motion vectors: 8x8 mode*/

-                h263_pred_motion(s, i, 0, &pred_x, &pred_y);

-

-                motion_x= s->current_picture.motion_val[0][ s->block_index[i] ][0];

-                motion_y= s->current_picture.motion_val[0][ s->block_index[i] ][1];

-                if (!s->umvplus) {

-                    ff_h263_encode_motion_vector(s, motion_x - pred_x,

-                                                    motion_y - pred_y, 1);

-                }

-                else {

-                    h263p_encode_umotion(s, motion_x - pred_x);

-                    h263p_encode_umotion(s, motion_y - pred_y);

-                    if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1))

-                        /* To prevent Start Code emulation */

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

-                }

-            }

-        }

-

-        if(interleaved_stats){

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

-        }

-    } else {

-        assert(s->mb_intra);

-

-        cbp = 0;

-        if (s->h263_aic) {

-            /* Predict DC */

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

-                int16_t level = block[i][0];

-                int scale;

-

-                if(i<4) scale= s->y_dc_scale;

-                else    scale= s->c_dc_scale;

-

-                pred_dc = h263_pred_dc(s, i, &dc_ptr[i]);

-                level -= pred_dc;

-                /* Quant */

-                if (level >= 0)

-                    level = (level + (scale>>1))/scale;

-                else

-                    level = (level - (scale>>1))/scale;

-

-                /* AIC can change CBP */

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

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

-

-                if(!s->modified_quant){

-                    if (level < -127)

-                        level = -127;

-                    else if (level > 127)

-                        level = 127;

-                }

-

-                block[i][0] = level;

-                /* Reconstruction */

-                rec_intradc[i] = scale*level + pred_dc;

-                /* Oddify */

-                rec_intradc[i] |= 1;

-                //if ((rec_intradc[i] % 2) == 0)

-                //    rec_intradc[i]++;

-                /* Clipping */

-                if (rec_intradc[i] < 0)

-                    rec_intradc[i] = 0;

-                else if (rec_intradc[i] > 2047)

-                    rec_intradc[i] = 2047;

-

-                /* Update AC/DC tables */

-                *dc_ptr[i] = rec_intradc[i];

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

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

-            }

-        }else{

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

-                /* compute cbp */

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

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

-            }

-        }

-

-        cbpc = cbp & 3;

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

-            if(s->dquant) cbpc+=4;

-            put_bits(&s->pb,

-                ff_h263_intra_MCBPC_bits[cbpc],

-                ff_h263_intra_MCBPC_code[cbpc]);

-        } else {

-            if(s->dquant) cbpc+=8;

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

-            put_bits(&s->pb,

-                ff_h263_inter_MCBPC_bits[cbpc + 4],

-                ff_h263_inter_MCBPC_code[cbpc + 4]);

-        }

-        if (s->h263_aic) {

-            /* XXX: currently, we do not try to use ac prediction */

-            put_bits(&s->pb, 1, 0);     /* no AC prediction */

-        }

-        cbpy = cbp >> 2;

-        put_bits(&s->pb, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);

-        if(s->dquant)

-            put_bits(&s->pb, 2, dquant_code[s->dquant+2]);

-

-        if(interleaved_stats){

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

-        }

-    }

-

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

-        /* encode each block */

-        h263_encode_block(s, block[i], i);

-

-        /* Update INTRADC for decoding */

-        if (s->h263_aic && s->mb_intra) {

-            block[i][0] = rec_intradc[i];

-

-        }

-    }

-

-    if(interleaved_stats){

-        if (!s->mb_intra) {

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

-            s->f_count++;

-        }else{

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

-            s->i_count++;

-        }

-    }

-}

-#endif

-

 void ff_h263_loop_filter(MpegEncContext * s){

     int qp_c;

     const int linesize  = s->linesize;

@@ -880,7 +226,7 @@ void ff_h263_loop_filter(MpegEncContext * s){

     }

 }

-static void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n)

+void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n)

 {

     int x, y, wrap, a, c, pred_dc, scale, i;

     int16_t *dc_val, *ac_val, *ac_val1;

@@ -1025,229 +371,6 @@ int16_t *h263_pred_motion(MpegEncContext * s, int block, int dir,

     return *mot_val;

 }

-#if CONFIG_ENCODERS

-

-/***************************************************/

-void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code)

-{

-    int range, l, bit_size, sign, code, bits;

-

-    if (val == 0) {

-        /* zero vector */

-        code = 0;

-        put_bits(&s->pb, mvtab[code][1], mvtab[code][0]);

-    } else {

-        bit_size = f_code - 1;

-        range = 1 << bit_size;

-        /* modulo encoding */

-        l= INT_BIT - 6 - bit_size;

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

-        sign = val>>31;

-        val= (val^sign)-sign;

-        sign&=1;

-

-        val--;

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

-        bits = val & (range - 1);

-

-        put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign);

-        if (bit_size > 0) {

-            put_bits(&s->pb, bit_size, bits);

-        }

-    }

-}

-

-static void init_mv_penalty_and_fcode(MpegEncContext *s)

-{

-    int f_code;

-    int mv;

-

-    for(f_code=1; f_code<=MAX_FCODE; f_code++){

-        for(mv=-MAX_MV; mv<=MAX_MV; mv++){

-            int len;

-

-            if(mv==0) len= mvtab[0][1];

-            else{

-                int val, bit_size, code;

-

-                bit_size = f_code - 1;

-

-                val=mv;

-                if (val < 0)

-                    val = -val;

-                val--;

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

-                if(code<33){

-                    len= mvtab[code][1] + 1 + bit_size;

-                }else{

-                    len= mvtab[32][1] + av_log2(code>>5) + 2 + bit_size;

-                }

-            }

-

-            mv_penalty[f_code][mv+MAX_MV]= len;

-        }

-    }

-

-    for(f_code=MAX_FCODE; f_code>0; f_code--){

-        for(mv=-(16<<f_code); mv<(16<<f_code); mv++){

-            fcode_tab[mv+MAX_MV]= f_code;

-        }

-    }

-

-    for(mv=0; mv<MAX_MV*2+1; mv++){

-        umv_fcode_tab[mv]= 1;

-    }

-}

-

-static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){

-    int slevel, run, last;

-

-    assert(MAX_LEVEL >= 64);

-    assert(MAX_RUN   >= 63);

-

-    for(slevel=-64; slevel<64; slevel++){

-        if(slevel==0) continue;

-        for(run=0; run<64; run++){

-            for(last=0; last<=1; last++){

-                const int index= UNI_MPEG4_ENC_INDEX(last, run, slevel+64);

-                int level= slevel < 0 ? -slevel : slevel;

-                int sign= slevel < 0 ? 1 : 0;

-                int bits, len, code;

-

-                len_tab[index]= 100;

-

-                /* ESC0 */

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

-                bits= rl->table_vlc[code][0];

-                len=  rl->table_vlc[code][1];

-                bits=bits*2+sign; len++;

-

-                if(code!=rl->n && len < len_tab[index]){

-                    if(bits_tab) bits_tab[index]= bits;

-                    len_tab [index]= len;

-                }

-                /* ESC */

-                bits= rl->table_vlc[rl->n][0];

-                len = rl->table_vlc[rl->n][1];

-                bits=bits*2+last; len++;

-                bits=bits*64+run; len+=6;

-                bits=bits*256+(level&0xff); len+=8;

-

-                if(len < len_tab[index]){

-                    if(bits_tab) bits_tab[index]= bits;

-                    len_tab [index]= len;

-                }

-            }

-        }

-    }

-}

-

-void h263_encode_init(MpegEncContext *s)

-{

-    static int done = 0;

-

-    if (!done) {

-        done = 1;

-

-        init_rl(&ff_h263_rl_inter, static_rl_table_store[0]);

-        init_rl(&rl_intra_aic, static_rl_table_store[1]);

-

-        init_uni_h263_rl_tab(&rl_intra_aic, NULL, uni_h263_intra_aic_rl_len);

-        init_uni_h263_rl_tab(&ff_h263_rl_inter    , NULL, uni_h263_inter_rl_len);

-

-        init_mv_penalty_and_fcode(s);

-    }

-    s->me.mv_penalty= mv_penalty; //FIXME exact table for msmpeg4 & h263p

-

-    s->intra_ac_vlc_length     =s->inter_ac_vlc_length     = uni_h263_inter_rl_len;

-    s->intra_ac_vlc_last_length=s->inter_ac_vlc_last_length= uni_h263_inter_rl_len + 128*64;

-    if(s->h263_aic){

-        s->intra_ac_vlc_length     = uni_h263_intra_aic_rl_len;

-        s->intra_ac_vlc_last_length= uni_h263_intra_aic_rl_len + 128*64;

-    }

-    s->ac_esc_length= 7+1+6+8;

-

-    // use fcodes >1 only for mpeg4 & h263 & h263p FIXME

-    switch(s->codec_id){

-    case CODEC_ID_MPEG4:

-        s->fcode_tab= fcode_tab;