Browse Source

audioconvert: support simd code with specific alignment requirements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 13 years ago
parent
commit
ceb9f8d927
2 changed files with 19 additions and 1 deletions
  1. +17
    -1
      libswresample/audioconvert.c
  2. +2
    -0
      libswresample/audioconvert.h

+ 17
- 1
libswresample/audioconvert.c View File

@@ -170,12 +170,28 @@ int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len
int ch;
int off=0;
const int os= (out->planar ? 1 :out->ch_count) *out->bps;
unsigned misaligned = 0;

av_assert0(ctx->channels == out->ch_count);

if (ctx->in_simd_align_mask) {
int planes = in->planar ? in->ch_count : 1;
unsigned m = 0;
for (ch = 0; ch < planes; ch++)
m |= (intptr_t)in->ch[ch];
misaligned |= m & ctx->in_simd_align_mask;
}
if (ctx->out_simd_align_mask) {
int planes = out->planar ? out->ch_count : 1;
unsigned m = 0;
for (ch = 0; ch < planes; ch++)
m |= (intptr_t)out->ch[ch];
misaligned |= m & ctx->out_simd_align_mask;
}

//FIXME optimize common cases

if(ctx->simd_f && !ctx->ch_map){
if(ctx->simd_f && !ctx->ch_map && !misaligned){
off = len&~15;
av_assert1(off>=0);
av_assert1(off<=len);


+ 2
- 0
libswresample/audioconvert.h View File

@@ -38,6 +38,8 @@ typedef void (simd_func_type)(uint8_t **dst, const uint8_t **src, int len);

typedef struct AudioConvert {
int channels;
int in_simd_align_mask;
int out_simd_align_mask;
conv_func_type *conv_f;
simd_func_type *simd_f;
const int *ch_map;


Loading…
Cancel
Save