From 282ddc84776683667e417a62186be57b97be3eab Mon Sep 17 00:00:00 2001 From: Rodeo Date: Wed, 21 Nov 2012 18:29:34 +0000 Subject: Improve support for planar audio. - encavcodecaudio: use libavresample directly (instead of via the hb_audio_resample wrapper), and add support for planar output - hb_audio_resample: add support for planar input - hb_audio_remap: add support for planar input - deca52: output planar float samples (no re-interleaving) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5073 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/audio_resample.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libhb/audio_resample.h') diff --git a/libhb/audio_resample.h b/libhb/audio_resample.h index baee471a6..62a536d61 100644 --- a/libhb/audio_resample.h +++ b/libhb/audio_resample.h @@ -27,7 +27,6 @@ typedef struct { - int do_remix; int dual_mono_downmix; int dual_mono_right_only; @@ -67,12 +66,9 @@ typedef struct * * Also sets the default audio input characteristics, so that they are the same * as the output characteristics (no conversion needed). - * - * If do_remix is 0, it will be assumed that any remixing was *already* done. */ hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt, - int hb_amixdown, int do_remix, - int normalize_mix_level); + int hb_amixdown, int normalize_mix); /* The following functions set the audio input characteristics. * @@ -110,6 +106,6 @@ void hb_audio_resample_free(hb_audio_resample_t *resample); * resampling is only done when necessary. */ hb_buffer_t* hb_audio_resample(hb_audio_resample_t *resample, - void *samples, int nsamples); + uint8_t **samples, int nsamples); #endif /* AUDIO_RESAMPLE_H */ -- cgit v1.2.3