comparison msmpeg4.c @ 774:baa66649df35 libavcodec

mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)

773:ab67f85da840

int frame_count = 0;
#endif

#include "msmpeg4data.h"

static UINT8 rl_length[2][NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];

#ifdef STATS

const char *st_names[ST_NB] = {
    "unknown",

            for(level=0; level<=MAX_LEVEL; level++){
                int run;
                for(run=0; run<=MAX_RUN; run++){
                    int last;
                    for(last=0; last<2; last++){
                        rl_length[0][i][level][run][last]= get_size_of_code(s, &rl_table[  i], last, run, level,0);
                        rl_length[1][i][level][run][last]= get_size_of_code(s, &rl_table[  i], last, run, level,1);
                    }
                }
            }
        }
    }

                    int inter_count       = s->ac_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  *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  *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;
            }
        }

774:baa66649df35

int frame_count = 0;
#endif

#include "msmpeg4data.h"

static UINT8 rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];

#ifdef STATS

const char *st_names[ST_NB] = {
    "unknown",

            for(level=0; level<=MAX_LEVEL; level++){
                int run;
                for(run=0; run<=MAX_RUN; run++){
                    int last;
                    for(last=0; last<2; last++){
                        rl_length[i][level][run][last]= get_size_of_code(s, &rl_table[  i], last, run, level, 0);
                    }
                }
            }
        }
    }

                    int inter_count       = s->ac_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  *rl_length[i  ][level][run][last];
                        chroma_size+= intra_chroma_count*rl_length[i+3][level][run][last];
                    }else{
                        size+=        intra_luma_count  *rl_length[i  ][level][run][last]
                                     +intra_chroma_count*rl_length[i+3][level][run][last]
                                     +inter_count       *rl_length[i+3][level][run][last];
                    }                   
                }
                if(last_size == size+chroma_size) break;
            }
        }