mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 00:02:52 +00:00
parent
7a02b364b6
commit
ff994c2aaa
@ -445,14 +445,23 @@ av_cold int swri_rematrix_init(SwrContext *s){
|
||||
s->mix_2_1_f = (mix_2_1_func_type*)sum2_double;
|
||||
s->mix_any_f = (mix_any_func_type*)get_mix_any_func_double(s);
|
||||
}else if(s->midbuf.fmt == AV_SAMPLE_FMT_S32P){
|
||||
// Only for dithering currently
|
||||
// s->native_matrix = av_calloc(nb_in * nb_out, sizeof(double));
|
||||
s->native_one = av_mallocz(sizeof(int));
|
||||
if (!s->native_one)
|
||||
return AVERROR(ENOMEM);
|
||||
// for (i = 0; i < nb_out; i++)
|
||||
// for (j = 0; j < nb_in; j++)
|
||||
// ((double*)s->native_matrix)[i * nb_in + j] = s->matrix[i][j];
|
||||
s->native_matrix = av_calloc(nb_in * nb_out, sizeof(int));
|
||||
if (!s->native_matrix) {
|
||||
av_freep(&s->native_one);
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
for (i = 0; i < nb_out; i++) {
|
||||
double rem = 0;
|
||||
|
||||
for (j = 0; j < nb_in; j++) {
|
||||
double target = s->matrix[i][j] * 32768 + rem;
|
||||
((int*)s->native_matrix)[i * nb_in + j] = lrintf(target);
|
||||
rem += target - ((int*)s->native_matrix)[i * nb_in + j];
|
||||
}
|
||||
}
|
||||
*((int*)s->native_one) = 32768;
|
||||
s->mix_1_1_f = (mix_1_1_func_type*)copy_s32;
|
||||
s->mix_2_1_f = (mix_2_1_func_type*)sum2_s32;
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
#define LIBSWRESAMPLE_VERSION_MAJOR 3
|
||||
#define LIBSWRESAMPLE_VERSION_MINOR 0
|
||||
#define LIBSWRESAMPLE_VERSION_MICRO 100
|
||||
#define LIBSWRESAMPLE_VERSION_MICRO 101
|
||||
|
||||
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
|
||||
LIBSWRESAMPLE_VERSION_MINOR, \
|
||||
|
Loading…
Reference in New Issue
Block a user