diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/snow.c | 30 | ||||
| -rw-r--r-- | libavcodec/snow.h | 4 |
2 files changed, 19 insertions, 15 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 25881dfdcb..59e283948d 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -1197,9 +1197,9 @@ void ff_spatial_dwt(DWTELEM *buffer, int width, int height, int stride, int type for(level=0; level<decomposition_count; level++){ switch(type){ - case 0: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break; - case 1: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break; - case 2: spatial_decomposeX (buffer, width>>level, height>>level, stride<<level); break; + case DWT_97: spatial_decompose97i(buffer, width>>level, height>>level, stride<<level); break; + case DWT_53: spatial_decompose53i(buffer, width>>level, height>>level, stride<<level); break; + case DWT_X: spatial_decomposeX (buffer, width>>level, height>>level, stride<<level); break; } } } @@ -1502,10 +1502,10 @@ static void ff_spatial_idwt_buffered_init(dwt_compose_t *cs, slice_buffer * sb, int level; for(level=decomposition_count-1; level>=0; level--){ switch(type){ - case 0: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; - case 1: spatial_compose53i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; + case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; + case DWT_53: spatial_compose53i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; /* not slicified yet */ - case 2: /*spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;*/ + case DWT_X: /*spatial_composeX(buffer, width>>level, height>>level, stride<<level); break;*/ av_log(NULL, AV_LOG_ERROR, "spatial_composeX neither buffered nor slicified yet.\n"); break; } } @@ -1515,10 +1515,10 @@ static void ff_spatial_idwt_init(dwt_compose_t *cs, DWTELEM *buffer, int width, int level; for(level=decomposition_count-1; level>=0; level--){ switch(type){ - case 0: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break; - case 1: spatial_compose53i_init(cs+level, buffer, height>>level, stride<<level); break; + case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break; + case DWT_53: spatial_compose53i_init(cs+level, buffer, height>>level, stride<<level); break; /* not slicified yet */ - case 2: spatial_composeX(buffer, width>>level, height>>level, stride<<level); break; + case DWT_X: spatial_composeX(buffer, width>>level, height>>level, stride<<level); break; } } } @@ -1531,11 +1531,11 @@ static void ff_spatial_idwt_slice(dwt_compose_t *cs, DWTELEM *buffer, int width, for(level=decomposition_count-1; level>=0; level--){ while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){ switch(type){ - case 0: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); + case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); break; - case 1: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); + case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); break; - case 2: break; + case DWT_X: break; } } } @@ -1549,11 +1549,11 @@ static void ff_spatial_idwt_buffered_slice(DSPContext *dsp, dwt_compose_t *cs, s for(level=decomposition_count-1; level>=0; level--){ while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){ switch(type){ - case 0: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level); + case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level); break; - case 1: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level); + case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level); break; - case 2: break; + case DWT_X: break; } } } diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 4704177be9..26b30abe57 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -35,6 +35,10 @@ #define LOG2_OBMC_MAX 8 #define OBMC_MAX (1<<(LOG2_OBMC_MAX)) +#define DWT_97 0 +#define DWT_53 1 +#define DWT_X 2 + /** Used to minimize the amount of memory used in order to optimize cache performance. **/ struct slice_buffer_s { DWTELEM * * line; ///< For use by idwt and predict_slices. |