MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swresample/x86/rematrix_init: Check av_malloc* return codes, forward errors

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-09 10:12:45 +01:00
parent 48ffaaaaef
commit b74ecb82fa
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libswresample/rematrix.c
View File

@ -415,7 +415,8 @@ av_cold int swri_rematrix_init(SwrContext *s){
s->matrix_ch[i][0]= ch_in; s->matrix_ch[i][0]= ch_in;
} }
if(HAVE_YASM && HAVE_MMX) swri_rematrix_init_x86(s); if(HAVE_YASM && HAVE_MMX)
return swri_rematrix_init_x86(s);
return 0; return 0;
} }

2
libswresample/swresample_internal.h
View File

@ -183,7 +183,7 @@ void swri_noise_shaping_double(SwrContext *s, AudioData *dsts, const AudioData *
int swri_rematrix_init(SwrContext *s); int swri_rematrix_init(SwrContext *s);
void swri_rematrix_free(SwrContext *s); void swri_rematrix_free(SwrContext *s);
int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mustcopy); int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mustcopy);
void swri_rematrix_init_x86(struct SwrContext *s); int swri_rematrix_init_x86(struct SwrContext *s);
void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt); void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt);
int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt); int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt);

11
libswresample/x86/rematrix_init.c
View File

@ -30,7 +30,7 @@ D(float, avx)
D(int16, mmx) D(int16, mmx)
D(int16, sse2) D(int16, sse2)
av_cold void swri_rematrix_init_x86(struct SwrContext *s){ av_cold int swri_rematrix_init_x86(struct SwrContext *s){
#if HAVE_YASM #if HAVE_YASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
int nb_in = av_get_channel_layout_nb_channels(s->in_ch_layout); int nb_in = av_get_channel_layout_nb_channels(s->in_ch_layout);
@ -52,6 +52,9 @@ av_cold void swri_rematrix_init_x86(struct SwrContext *s){
} }
s->native_simd_matrix = av_mallocz_array(num, 2 * sizeof(int16_t)); s->native_simd_matrix = av_mallocz_array(num, 2 * sizeof(int16_t));
s->native_simd_one = av_mallocz(2 * sizeof(int16_t)); s->native_simd_one = av_mallocz(2 * sizeof(int16_t));
if (!s->native_simd_matrix || !s->native_simd_one)
return AVERROR(ENOMEM);
for(i=0; i<nb_out; i++){ for(i=0; i<nb_out; i++){
int sh = 0; int sh = 0;
for(j=0; j<nb_in; j++) for(j=0; j<nb_in; j++)
@ -75,9 +78,13 @@ av_cold void swri_rematrix_init_x86(struct SwrContext *s){
s->mix_2_1_simd = ff_mix_2_1_a_float_avx; s->mix_2_1_simd = ff_mix_2_1_a_float_avx;
} }
s->native_simd_matrix = av_mallocz_array(num, sizeof(float)); s->native_simd_matrix = av_mallocz_array(num, sizeof(float));
memcpy(s->native_simd_matrix, s->native_matrix, num * sizeof(float));
s->native_simd_one = av_mallocz(sizeof(float)); s->native_simd_one = av_mallocz(sizeof(float));
if (!s->native_simd_matrix || !s->native_simd_one)
return AVERROR(ENOMEM);
memcpy(s->native_simd_matrix, s->native_matrix, num * sizeof(float));
memcpy(s->native_simd_one, s->native_one, sizeof(float)); memcpy(s->native_simd_one, s->native_one, sizeof(float));
} }
#endif #endif
return 0;
} }