lswr/rematrix: Support s32p.

Fixes ticket #6785.

Carl Eugen Hoyos committed 9 years ago

Commit ff994c21 parent 7a02b362 files · +15 −6Browse files

Showing the changes to libswresample (2 of 2 files). Show all

Unified · Split

2 files

         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++)
+        s->native_matrix = av_calloc(nb_in * nb_out, sizeof(int));
-//             for (j = 0; j < nb_in; j++)
+        if (!s->native_matrix) {
-//                 ((double*)s->native_matrix)[i * nb_in + j] = s->matrix[i][j];
+            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 @@ · 29 unmodified lines
30		30
31	#define LIBSWRESAMPLE_VERSION_MAJOR 3	31	#define LIBSWRESAMPLE_VERSION_MAJOR 3
32	#define LIBSWRESAMPLE_VERSION_MINOR 0	32	#define LIBSWRESAMPLE_VERSION_MINOR 0
33	#define LIBSWRESAMPLE_VERSION_MICRO 100	33	#define LIBSWRESAMPLE_VERSION_MICRO 101
34		34
35	#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \	35	#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
36	LIBSWRESAMPLE_VERSION_MINOR, \	36	LIBSWRESAMPLE_VERSION_MINOR, \

Keyboard shortcuts