# HG changeset patch # User michaelni # Date 1028852034 0 # Node ID 76e9b51cccda7b3e70b80750c09d7eed69bdc620 # Parent b684f0f9ff7280bbb2cdeff4f32f55c76c9c05ee faster vlc table selection diff -r b684f0f9ff72 -r 76e9b51cccda msmpeg4.c --- a/msmpeg4.c Thu Aug 08 10:46:16 2002 +0000 +++ b/msmpeg4.c Fri Aug 09 00:13:54 2002 +0000 @@ -60,11 +60,12 @@ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val); static void init_h263_dc_for_msmpeg4(void); static inline void msmpeg4_memsetw(short *tab, int val, int n); - +static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra); extern UINT32 inverse[256]; + #ifdef DEBUG int intra_count = 0; int frame_count = 0; @@ -72,6 +73,8 @@ #include "msmpeg4data.h" +static int rl_length[2][NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2]; + #ifdef STATS const char *st_names[ST_NB] = { @@ -187,7 +190,6 @@ wmv1_scantable[i][k]= block_permute_op(j); } } - } } @@ -236,6 +238,20 @@ init_mv_table(&mv_tables[1]); for(i=0;iac_stats[0][0][level][run][last] + s->ac_stats[0][1][level][run][last]; int intra_luma_count = s->ac_stats[1][0][level][run][last]; int intra_chroma_count= s->ac_stats[1][1][level][run][last]; - + if(s->pict_type==I_TYPE){ - size += intra_luma_count *get_size_of_code(s, &rl_table[ i], last, run, level,1); - chroma_size+= intra_chroma_count*get_size_of_code(s, &rl_table[3+i], last, run, level,1); + size += intra_luma_count *rl_length[1][i ][level][run][last]; + chroma_size+= intra_chroma_count*rl_length[1][i+3][level][run][last]; }else{ - size+= intra_luma_count *get_size_of_code(s, &rl_table[ i], last, run, level,1) - +intra_chroma_count*get_size_of_code(s, &rl_table[3+i], last, run, level,1) - +inter_count *get_size_of_code(s, &rl_table[3+i], last, run, level,0); + size+= intra_luma_count *rl_length[1][i ][level][run][last] + +intra_chroma_count*rl_length[1][i+3][level][run][last] + +inter_count *rl_length[0][i+3][level][run][last]; } } + if(last_size == size+chroma_size) break; } } if(sizepict_type, best, s->qscale, s->mb_var_sum, s->mc_mb_var_sum, best_size); @@ -952,6 +970,7 @@ sign = 1; level = -level; } + if(level<=MAX_LEVEL && run<=MAX_RUN){ s->ac_stats[s->mb_intra][n>3][level][run][last]++; }