diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-08-16 16:29:26 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-08-16 16:29:26 +0100 |
| commit | d3e91bb09c694dc8a71b77f098ab251755763410 (patch) | |
| tree | 1e2d82197a62813e8dd0b49e112e1b0f965fc5bd /src/xine-engine/resample.h | |
| parent | f43c0bf92a48824ed075473e9035d4c0dfe5cf33 (diff) | |
| parent | 7047d9e5acf97c91a523c99ccc4b008a35a3e094 (diff) | |
| download | xine-lib-d3e91bb09c694dc8a71b77f098ab251755763410.tar.gz xine-lib-d3e91bb09c694dc8a71b77f098ab251755763410.tar.bz2 | |
Merge all but the open()/glibc workaround from 1.1.
Diffstat (limited to 'src/xine-engine/resample.h')
| -rw-r--r-- | src/xine-engine/resample.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/xine-engine/resample.h b/src/xine-engine/resample.h index e5aad1afa..1fd478d06 100644 --- a/src/xine-engine/resample.h +++ b/src/xine-engine/resample.h @@ -27,19 +27,26 @@ #ifndef HAVE_RESAMPLE_H #define HAVE_RESAMPLE_H -void _x_audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, +#define RESAMPLE_MAX_CHANNELS 6 + +void _x_audio_out_resample_stereo(int16_t* last_sample, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; -void _x_audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, +void _x_audio_out_resample_mono(int16_t* last_sample, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; -void _x_audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, +void _x_audio_out_resample_4channel(int16_t* last_sample, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; -void _x_audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, +void _x_audio_out_resample_5channel(int16_t* last_sample, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; -void _x_audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, +void _x_audio_out_resample_6channel(int16_t* last_sample, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; void _x_audio_out_resample_8to16(int8_t* input_samples, |