virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

h264: (trivial) make ff_h264_lps_state static

Browse Source 
not used outside the cabac test functions (which probably means it's
a bad test if it doesn't use the same tables as the real functions?)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Roland Scheidegger
2012-04-27 22:12:18 +02:00
committed by Michael Niedermayer
parent 5520df6a8f
commit e52b96187b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/cabac.c
View File

@@ -52,8 +52,8 @@ static const uint8_t lps_range[64][4]= {
uint8_t ff_h264_mlps_state[4*64]; uint8_t ff_h264_mlps_state[4*64];
uint8_t ff_h264_lps_range[4*2*64]; uint8_t ff_h264_lps_range[4*2*64];
uint8_t ff_h264_lps_state[2*64]; static uint8_t h264_lps_state[2*64];
static uint8_t h264_mps_state[2 * 64]; static uint8_t h264_mps_state[2*64];
static const uint8_t mps_state[64]= { static const uint8_t mps_state[64]= {
1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8,
@@ -147,14 +147,14 @@ void ff_init_cabac_states(CABACContext *c){
h264_mps_state[2 * i + 1] = 2 * mps_state[i] + 1; h264_mps_state[2 * i + 1] = 2 * mps_state[i] + 1;
if( i ){ if( i ){
ff_h264_lps_state[2*i+0]= h264_lps_state[2*i+0]=
ff_h264_mlps_state[128-2*i-1]= 2*lps_state[i]+0; ff_h264_mlps_state[128-2*i-1]= 2*lps_state[i]+0;
ff_h264_lps_state[2*i+1]= h264_lps_state[2*i+1]=
ff_h264_mlps_state[128-2*i-2]= 2*lps_state[i]+1; ff_h264_mlps_state[128-2*i-2]= 2*lps_state[i]+1;
}else{ }else{
ff_h264_lps_state[2*i+0]= h264_lps_state[2*i+0]=
ff_h264_mlps_state[128-2*i-1]= 1; ff_h264_mlps_state[128-2*i-1]= 1;
ff_h264_lps_state[2*i+1]= h264_lps_state[2*i+1]=
ff_h264_mlps_state[128-2*i-2]= 0; ff_h264_mlps_state[128-2*i-2]= 0;
} }
} }
@@ -201,7 +201,7 @@ static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
}else{ }else{
c->low += c->range - RangeLPS; c->low += c->range - RangeLPS;
c->range = RangeLPS; c->range = RangeLPS;
*state= ff_h264_lps_state[*state]; *state= h264_lps_state[*state];
} }
renorm_cabac_encoder(c); renorm_cabac_encoder(c);