This test tests only the DSP functions and does not really use the SnowContext at all.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> --- libavcodec/tests/snowenc.c | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/libavcodec/tests/snowenc.c b/libavcodec/tests/snowenc.c index 6beb43d562..cb11bb1752 100644 --- a/libavcodec/tests/snowenc.c +++ b/libavcodec/tests/snowenc.c @@ -30,23 +30,22 @@ #include "libavutil/mathematics.h" #include "libavutil/mem.h" -#include "libavcodec/snow.h" #include "libavcodec/snow_dwt.h" int main(void){ #define width 256 #define height 256 int buffer[2][width*height]; - SnowContext s; + DWTELEM *temp_dwt_buffer; + IDWTELEM *temp_idwt_buffer; + int spatial_decomposition_type = 1, spatial_decomposition_count = 6; int i; AVLFG prng; - s.spatial_decomposition_count=6; - s.spatial_decomposition_type=1; - s.temp_dwt_buffer = av_calloc(width, sizeof(*s.temp_dwt_buffer)); - s.temp_idwt_buffer = av_calloc(width, sizeof(*s.temp_idwt_buffer)); + temp_dwt_buffer = av_calloc(width, sizeof(*temp_dwt_buffer)); + temp_idwt_buffer = av_calloc(width, sizeof(*temp_idwt_buffer)); - if (!s.temp_dwt_buffer || !s.temp_idwt_buffer) { + if (!temp_dwt_buffer || !temp_idwt_buffer) { fprintf(stderr, "Failed to allocate memory\n"); return 1; } @@ -57,36 +56,36 @@ int main(void){ for(i=0; i<width*height; i++) buffer[0][i] = buffer[1][i] = av_lfg_get(&prng) % 54321 - 12345; - ff_spatial_dwt(buffer[0], s.temp_dwt_buffer, width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count); - ff_spatial_idwt((IDWTELEM*)buffer[0], s.temp_idwt_buffer, width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count); + ff_spatial_dwt(buffer[0], temp_dwt_buffer, width, height, width, spatial_decomposition_type, spatial_decomposition_count); + ff_spatial_idwt((IDWTELEM*)buffer[0], temp_idwt_buffer, width, height, width, spatial_decomposition_type, spatial_decomposition_count); for(i=0; i<width*height; i++) if(buffer[0][i]!= buffer[1][i]) printf("fsck: %6d %12d %7d\n",i, buffer[0][i], buffer[1][i]); printf("testing 9/7 DWT\n"); - s.spatial_decomposition_type=0; + spatial_decomposition_type = 0; for(i=0; i<width*height; i++) buffer[0][i] = buffer[1][i] = av_lfg_get(&prng) % 54321 - 12345; - ff_spatial_dwt(buffer[0], s.temp_dwt_buffer, width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count); - ff_spatial_idwt((IDWTELEM*)buffer[0], s.temp_idwt_buffer, width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count); + ff_spatial_dwt(buffer[0], temp_dwt_buffer, width, height, width, spatial_decomposition_type, spatial_decomposition_count); + ff_spatial_idwt((IDWTELEM*)buffer[0], temp_idwt_buffer, width, height, width, spatial_decomposition_type, spatial_decomposition_count); for(i=0; i<width*height; i++) if(FFABS(buffer[0][i] - buffer[1][i])>20) printf("fsck: %6d %12d %7d\n",i, buffer[0][i], buffer[1][i]); { - int level, orientation, x, y; + int orientation, x, y; int64_t errors[8][4]; int64_t g=0; memset(errors, 0, sizeof(errors)); - s.spatial_decomposition_count=3; - s.spatial_decomposition_type=0; - for(level=0; level<s.spatial_decomposition_count; level++){ + spatial_decomposition_count = 3; + spatial_decomposition_type = 0; + for (int level = 0; level < spatial_decomposition_count; level++) { for(orientation=level ? 1 : 0; orientation<4; orientation++){ - int w= width >> (s.spatial_decomposition_count-level); - int h= height >> (s.spatial_decomposition_count-level); - int stride= width << (s.spatial_decomposition_count-level); + int w = width >> (spatial_decomposition_count - level); + int h = height >> (spatial_decomposition_count - level); + int stride = width << (spatial_decomposition_count - level); DWTELEM *buf= buffer[0]; int64_t error=0; @@ -95,7 +94,7 @@ int main(void){ memset(buffer[0], 0, sizeof(int)*width*height); buf[w/2 + h/2*stride]= 256*256; - ff_spatial_idwt((IDWTELEM*)buffer[0], s.temp_idwt_buffer, width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count); + ff_spatial_idwt((IDWTELEM*)buffer[0], temp_idwt_buffer, width, height, width, spatial_decomposition_type, spatial_decomposition_count); for(y=0; y<height; y++){ for(x=0; x<width; x++){ int64_t d= buffer[0][x + y*width]; @@ -111,7 +110,7 @@ int main(void){ } } printf("static int const visual_weight[][4]={\n"); - for(level=0; level<s.spatial_decomposition_count; level++){ + for (int level = 0; level < spatial_decomposition_count; level++) { printf(" {"); for(orientation=0; orientation<4; orientation++){ printf("%8"PRId64",", errors[level][orientation]/g); @@ -127,7 +126,7 @@ int main(void){ buffer[0][x+width*y]= 256*256*tab[(x&1) + 2*(y&1)]; } } - ff_spatial_dwt(buffer[0], s.temp_dwt_buffer, width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count); + ff_spatial_dwt(buffer[0], temp_dwt_buffer, width, height, width, spatial_decomposition_type, spatial_decomposition_count); for(y=0; y<height; y++){ for(x=0; x<width; x++){ int64_t d= buffer[0][x + y*width]; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".