Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

swr-test: fix pointer type warnings

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/30/merge
Michael Niedermayer 13 years ago
parent 7b2ce50701
commit f75169b251
1 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      libswresample/swresample_test.c

20
libswresample/swresample_test.c
Unescape View File

@ -256,7 +256,7 @@ int main(int argc, char **argv){
r = (seed * (uint64_t)(max_tests - test)) >>32;
FFSWAP(int, remaining_tests[r], remaining_tests[max_tests - test - 1]);
}
qsort(remaining_tests + max_tests - num_tests, num_tests, sizeof(remaining_tests[0]), cmp);
qsort(remaining_tests + max_tests - num_tests, num_tests, sizeof(remaining_tests[0]), (void*)cmp);
in_sample_rate=16000;
for(test=0; test<num_tests; test++){
char in_layout_string[256];
@ -309,27 +309,27 @@ int main(int argc, char **argv){
mode++;
mode%=3;
if(mode==0 /*|| out_sample_rate == in_sample_rate*/) {
mid_count= swr_convert(forw_ctx, amid, 3*SAMPLES, ain, SAMPLES);
mid_count= swr_convert(forw_ctx, amid, 3*SAMPLES, (const uint8_t **)ain, SAMPLES);
} else if(mode==1){
mid_count= swr_convert(forw_ctx, amid, 0, ain, SAMPLES);
mid_count+=swr_convert(forw_ctx, amid, 3*SAMPLES, ain, 0);
mid_count= swr_convert(forw_ctx, amid, 0, (const uint8_t **)ain, SAMPLES);
mid_count+=swr_convert(forw_ctx, amid, 3*SAMPLES, (const uint8_t **)ain, 0);
} else {
int tmp_count;
mid_count= swr_convert(forw_ctx, amid, 0, ain, 1);
mid_count= swr_convert(forw_ctx, amid, 0, (const uint8_t **)ain, 1);
av_assert0(mid_count==0);
shift(ain, 1, in_ch_count, in_sample_fmt);
mid_count+=swr_convert(forw_ctx, amid, 3*SAMPLES, ain, 0);
mid_count+=swr_convert(forw_ctx, amid, 3*SAMPLES, (const uint8_t **)ain, 0);
shift(amid, mid_count, out_ch_count, out_sample_fmt); tmp_count = mid_count;
mid_count+=swr_convert(forw_ctx, amid, 2, ain, 2);
mid_count+=swr_convert(forw_ctx, amid, 2, (const uint8_t **)ain, 2);
shift(amid, mid_count-tmp_count, out_ch_count, out_sample_fmt); tmp_count = mid_count;
shift(ain, 2, in_ch_count, in_sample_fmt);
mid_count+=swr_convert(forw_ctx, amid, 1, ain, SAMPLES-3);
mid_count+=swr_convert(forw_ctx, amid, 1, (const uint8_t **)ain, SAMPLES-3);
shift(amid, mid_count-tmp_count, out_ch_count, out_sample_fmt); tmp_count = mid_count;
shift(ain, -3, in_ch_count, in_sample_fmt);
mid_count+=swr_convert(forw_ctx, amid, 3*SAMPLES, ain, 0);
mid_count+=swr_convert(forw_ctx, amid, 3*SAMPLES, (const uint8_t **)ain, 0);
shift(amid, -tmp_count, out_ch_count, out_sample_fmt);
}
out_count= swr_convert(backw_ctx,aout, SAMPLES, amid, mid_count);
out_count= swr_convert(backw_ctx,aout, SAMPLES, (const uint8_t **)amid, mid_count);
for(ch=0; ch<in_ch_count; ch++){
double sse, maxdiff=0;

Write Preview
Loading…
Cancel
Save