Browse Source

swr: move AudioConvert to header

the next commits will need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.11
Michael Niedermayer 13 years ago
parent
commit
06b62cb8f2
2 changed files with 9 additions and 11 deletions
  1. +0
    -9
      libswresample/audioconvert.c
  2. +9
    -2
      libswresample/audioconvert.h

+ 0
- 9
libswresample/audioconvert.c View File

@@ -32,15 +32,6 @@
#include "audioconvert.h"


typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);

struct AudioConvert {
int channels;
conv_func_type *conv_f;
const int *ch_map;
uint8_t silence[8]; ///< silence input sample
};

#define CONV_FUNC_NAME(dst_fmt, src_fmt) conv_ ## src_fmt ## _to_ ## dst_fmt

//FIXME rounding ?


+ 9
- 2
libswresample/audioconvert.h View File

@@ -33,8 +33,15 @@
#include "libavutil/cpu.h"
#include "libavutil/audioconvert.h"

struct AudioConvert;
typedef struct AudioConvert AudioConvert;

typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);

typedef struct AudioConvert {
int channels;
conv_func_type *conv_f;
const int *ch_map;
uint8_t silence[8]; ///< silence input sample
}AudioConvert;

/**
* Create an audio sample format converter context


Loading…
Cancel
Save