diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-10-28 19:13:50 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-10-28 19:13:50 +0000 |
| commit | a67c21f093202f142438689d3f7cfbdf4ea82eea (patch) | |
| tree | 5c3295037f033904bc11ab8b3adae5b7331101e9 /src/pulsecore/sample-util.h | |
| parent | 6687dd013169fd8436aa1b45ccdacff074a40d05 (diff) | |
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/sample-util.h')
| -rw-r--r-- | src/pulsecore/sample-util.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/pulsecore/sample-util.h b/src/pulsecore/sample-util.h index 3ff065ab..0a39d5ca 100644 --- a/src/pulsecore/sample-util.h +++ b/src/pulsecore/sample-util.h @@ -39,10 +39,11 @@ typedef struct pa_mix_info { pa_memchunk chunk; pa_cvolume volume; void *userdata; + void *internal; /* Used internally by pa_mix(), should not be initialised when calling pa_mix() */ } pa_mix_info; size_t pa_mix( - const pa_mix_info channels[], + pa_mix_info channels[], unsigned nchannels, void *data, size_t length, @@ -55,4 +56,11 @@ void pa_volume_memchunk( const pa_sample_spec *spec, const pa_cvolume *volume); +size_t pa_frame_align(size_t l, const pa_sample_spec *ss) PA_GCC_PURE; + +int pa_frame_aligned(size_t l, const pa_sample_spec *ss) PA_GCC_PURE; + +void pa_interleave(const void *src[], unsigned channels, void *dst, size_t ss, unsigned n); +void pa_deinterleave(const void *src, void *dst[], unsigned channels, size_t ss, unsigned n); + #endif |