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

fix context=1

Browse Source 
remove always_inline, gcc fails to inline other more important inline functions otherwise ...

Originally committed as revision 2483 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-11-06 22:05:22 +00:00
parent 3f76a28759
commit 598401ceea
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/ffv1.c
View File

@ -364,7 +364,7 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState * const state, int
return ret; return ret;
} }
static always_inline void encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){ static inline void encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
PlaneContext * const p= &s->plane[plane_index]; PlaneContext * const p= &s->plane[plane_index];
CABACContext * const c= &s->c; CABACContext * const c= &s->c;
int x; int x;
@ -375,7 +375,7 @@ static always_inline void encode_line(FFV1Context *s, int w, int_fast16_t *sampl
for(x=0; x<w; x++){ for(x=0; x<w; x++){
int diff, context; int diff, context;
context= get_context(s, sample[1]+x, sample[0]+x, sample[1]+x); context= get_context(s, sample[1]+x, sample[0]+x, sample[2]+x);
diff= sample[1][x] - predict(sample[1]+x, sample[0]+x); diff= sample[1][x] - predict(sample[1]+x, sample[0]+x);
if(context < 0){ if(context < 0){
@ -430,8 +430,8 @@ static always_inline void encode_line(FFV1Context *s, int w, int_fast16_t *sampl
static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){ static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
int x,y; int x,y;
int_fast16_t sample_buffer[2][w+6]; int_fast16_t sample_buffer[3][w+6];
int_fast16_t *sample[2]= {sample_buffer[0]+3, sample_buffer[1]+3}; int_fast16_t *sample[3]= {sample_buffer[0]+3, sample_buffer[1]+3, sample_buffer[2]+3};
s->run_index=0; s->run_index=0;
memset(sample_buffer, 0, sizeof(sample_buffer)); memset(sample_buffer, 0, sizeof(sample_buffer));
@ -440,7 +440,8 @@ static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride,
int_fast16_t *temp= sample[0]; //FIXME try a normal buffer int_fast16_t *temp= sample[0]; //FIXME try a normal buffer
sample[0]= sample[1]; sample[0]= sample[1];
sample[1]= temp; sample[1]= sample[2];
sample[2]= temp;
sample[1][-1]= sample[0][0 ]; sample[1][-1]= sample[0][0 ];
sample[0][ w]= sample[0][w-1]; sample[0][ w]= sample[0][w-1];
@ -711,7 +712,7 @@ static int encode_end(AVCodecContext *avctx)
return 0; return 0;
} }
static always_inline void decode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){ static inline void decode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
PlaneContext * const p= &s->plane[plane_index]; PlaneContext * const p= &s->plane[plane_index];
CABACContext * const c= &s->c; CABACContext * const c= &s->c;
int x; int x;