RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swr: fix cpy() after the len was changed to be in samples. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-07 00:04:44 +02:00
parent 715c8a5a50
commit fecdc76a9f
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libswresample/audioconvert.c
View File

@ -107,9 +107,18 @@ static conv_func_type * const fmt_pair_to_conv_functions[AV_SAMPLE_FMT_NB*AV_SAM
FMT_PAIR_FUNC(AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBL), FMT_PAIR_FUNC(AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBL),
}; };
static void cpy(uint8_t **dst, const uint8_t **src, int len){ static void cpy1(uint8_t **dst, const uint8_t **src, int len){
memcpy(*dst, *src, len); memcpy(*dst, *src, len);
} }
static void cpy2(uint8_t **dst, const uint8_t **src, int len){
memcpy(*dst, *src, 2*len);
}
static void cpy4(uint8_t **dst, const uint8_t **src, int len){
memcpy(*dst, *src, 4*len);
}
static void cpy8(uint8_t **dst, const uint8_t **src, int len){
memcpy(*dst, *src, 8*len);
}
AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt, AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt,
enum AVSampleFormat in_fmt, enum AVSampleFormat in_fmt,
@ -136,8 +145,14 @@ AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt,
if (in_fmt == AV_SAMPLE_FMT_U8) if (in_fmt == AV_SAMPLE_FMT_U8)
memset(ctx->silence, 0x80, sizeof(ctx->silence)); memset(ctx->silence, 0x80, sizeof(ctx->silence));
if(out_fmt == in_fmt && !ch_map) if(out_fmt == in_fmt && !ch_map) {
ctx->simd_f = cpy; switch(av_get_bytes_per_sample(in_fmt)){
case 1:ctx->simd_f = cpy1; break;
case 2:ctx->simd_f = cpy2; break;
case 4:ctx->simd_f = cpy4; break;
case 8:ctx->simd_f = cpy8; break;
}
}
if(HAVE_YASM && HAVE_MMX) swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels); if(HAVE_YASM && HAVE_MMX) swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels);