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

cosmetics: Demplayerify indentation.

Browse Source 
Originally committed as revision 12240 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2008-02-26 17:56:00 +00:00
parent 301df48074
commit 94ae6788e2
1 changed files with 241 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/snow.c
View File

@@ -2467,7 +2467,8 @@ static av_always_inline void add_yblock(SnowContext *s, int sliced, slice_buffer
if(b_w<=0 || b_h<=0) return; if(b_w<=0 || b_h<=0) return;
assert(src_stride > 2*MB_SIZE + 5); assert(src_stride > 2*MB_SIZE + 5);
if(!sliced && offset_dst) if(!sliced && offset_dst)
dst += src_x + src_y*dst_stride; dst += src_x + src_y*dst_stride;
dst8+= src_x + src_y*src_stride; dst8+= src_x + src_y*src_stride;
@@ -3531,12 +3532,12 @@ static void update_last_header_values(SnowContext *s){
} }
} }
s->last_spatial_decomposition_type= s->spatial_decomposition_type; s->last_spatial_decomposition_type = s->spatial_decomposition_type;
s->last_qlog = s->qlog; s->last_qlog = s->qlog;
s->last_qbias = s->qbias; s->last_qbias = s->qbias;
s->last_mv_scale = s->mv_scale; s->last_mv_scale = s->mv_scale;
s->last_block_max_depth = s->block_max_depth; s->last_block_max_depth = s->block_max_depth;
s->last_spatial_decomposition_count= s->spatial_decomposition_count; s->last_spatial_decomposition_count = s->spatial_decomposition_count;
} }
static void decode_qlogs(SnowContext *s){ static void decode_qlogs(SnowContext *s){
@@ -4316,7 +4317,7 @@ redo_frame:
} }
} }
/* if(QUANTIZE2) /* if(QUANTIZE2)
dwt_quantize(s, p, s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type); dwt_quantize(s, p, s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type);
else*/ else*/
ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count); ff_spatial_dwt(s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
@@ -4394,6 +4395,7 @@ redo_frame:
s->avctx->error[plane_index] += error; s->avctx->error[plane_index] += error;
s->current_picture.error[plane_index] = error; s->current_picture.error[plane_index] = error;
} }
} }
update_last_header_values(s); update_last_header_values(s);
@@ -4522,7 +4524,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const
int x, y; int x, y;
int decode_state[MAX_DECOMPOSITIONS][4][1]; /* Stored state info for unpack_coeffs. 1 variable per instance. */ int decode_state[MAX_DECOMPOSITIONS][4][1]; /* Stored state info for unpack_coeffs. 1 variable per instance. */
if(s->avctx->debug&2048){ if(s->avctx->debug&2048){
memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h); memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
predict_plane(s, s->spatial_idwt_buffer, plane_index, 1); predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
@@ -4532,18 +4534,18 @@ if(s->avctx->debug&2048){
s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v; s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
} }
} }
} }
{ {
for(level=0; level<s->spatial_decomposition_count; level++){ for(level=0; level<s->spatial_decomposition_count; level++){
for(orientation=level ? 1 : 0; orientation<4; orientation++){ for(orientation=level ? 1 : 0; orientation<4; orientation++){
SubBand *b= &p->band[level][orientation]; SubBand *b= &p->band[level][orientation];
unpack_coeffs(s, b, b->parent, orientation); unpack_coeffs(s, b, b->parent, orientation);
} }
} }
} }
{ {
const int mb_h= s->b_height << s->block_max_depth; const int mb_h= s->b_height << s->block_max_depth;
const int block_size = MB_SIZE >> s->block_max_depth; const int block_size = MB_SIZE >> s->block_max_depth;
const int block_w = plane_index ? block_size/2 : block_size; const int block_w = plane_index ? block_size/2 : block_size;
@@ -4617,7 +4619,8 @@ if(s->avctx->debug&2048){
} }
slice_buffer_flush(&s->sb); slice_buffer_flush(&s->sb);
} }
} }
emms_c(); emms_c();
@@ -4629,9 +4632,9 @@ if(s->avctx->debug&2048){
av_free(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] - EDGE_WIDTH*(1+s->current_picture.linesize[i%3])); av_free(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] - EDGE_WIDTH*(1+s->current_picture.linesize[i%3]));
} }
if(!(s->avctx->debug&2048)) if(!(s->avctx->debug&2048))
*picture= s->current_picture; *picture= s->current_picture;
else else
*picture= s->mconly_picture; *picture= s->mconly_picture;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
@@ -4736,10 +4739,10 @@ int main(void){
if(j!=i*i*i/3*FFABS(i)) printf("fsck: %d != %d\n", i, j); if(j!=i*i*i/3*FFABS(i)) printf("fsck: %d != %d\n", i, j);
} }
#endif #endif
{ {
int level, orientation, x, y; int level, orientation, x, y;
int64_t errors[8][4]; int64_t errors[8][4];
int64_t g=0; int64_t g=0;
memset(errors, 0, sizeof(errors)); memset(errors, 0, sizeof(errors));
s.spatial_decomposition_count=3; s.spatial_decomposition_count=3;
@@ -4820,7 +4823,7 @@ int64_t g=0;
} }
} }
} }
return 0; return 0;
} }
#endif /* TEST */ #endif /* TEST */