swr: add native_simd_one

Michael Niedermayer committed 13 years ago

Commit 4cfc9201 parent e3e398b3 files · +7 −0Browse files

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

Unified · Split

3 files

@@ -403,6 +403,7 @@ av_cold void swri_rematrix_free(SwrContext *s){ · 402 unmodified lines
403	av_freep(&s->native_matrix);	403	av_freep(&s->native_matrix);
404	av_freep(&s->native_one);	404	av_freep(&s->native_one);
405	av_freep(&s->native_simd_matrix);	405	av_freep(&s->native_simd_matrix);
		406	av_freep(&s->native_simd_one);
406	}	407	}
407		408
408	int swri_rematrix(SwrContext s, AudioData out, AudioData *in, int len, int mustcopy){	409	int swri_rematrix(SwrContext s, AudioData out, AudioData *in, int len, int mustcopy){

@@ -134,6 +134,7 @@ struct SwrContext { · 133 unmodified lines
134	float matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< floating point rematrixing coefficients	134	float matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< floating point rematrixing coefficients
135	uint8_t *native_matrix;	135	uint8_t *native_matrix;
136	uint8_t *native_one;	136	uint8_t *native_one;
		137	uint8_t *native_simd_one;
137	uint8_t *native_simd_matrix;	138	uint8_t *native_simd_matrix;
138	int32_t matrix32[SWR_CH_MAX][SWR_CH_MAX]; ///< 17.15 fixed point rematrixing coefficients	139	int32_t matrix32[SWR_CH_MAX][SWR_CH_MAX]; ///< 17.15 fixed point rematrixing coefficients
139	uint8_t matrix_ch[SWR_CH_MAX][SWR_CH_MAX+1]; ///< Lists of input channels per output channel that have non zero rematrixing coefficients	140	uint8_t matrix_ch[SWR_CH_MAX][SWR_CH_MAX+1]; ///< Lists of input channels per output channel that have non zero rematrixing coefficients

             s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2;
         }
         s->native_simd_matrix = av_mallocz(2 * num * sizeof(int16_t));
+        s->native_simd_one    = av_mallocz(2 * sizeof(int16_t));
         for(i=0; i<nb_out; i++){
             int sh = 0;
             for(j=0; j<nb_in; j++)
                     ((((int*)s->native_matrix)[i * nb_in + j]) + (1<<sh>>1)) >> sh;
             }
         }
+        ((int16_t*)s->native_simd_one)[1] = 14;
+        ((int16_t*)s->native_simd_one)[0] = 16384;
     } else if(s->midbuf.fmt == AV_SAMPLE_FMT_FLTP){
         if(mm_flags & AV_CPU_FLAG_SSE) {
             s->mix_1_1_simd = ff_mix_1_1_a_float_sse;
         }
         s->native_simd_matrix = av_mallocz(num * sizeof(float));
         memcpy(s->native_simd_matrix, s->native_matrix, num * sizeof(float));
+        s->native_simd_one = av_mallocz(sizeof(float));
+        memcpy(s->native_simd_one, s->native_one, sizeof(float));
     }
 }

Keyboard shortcuts