diff options
| author | Rodeo <[email protected]> | 2012-08-27 22:00:28 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-08-27 22:00:28 +0000 |
| commit | 33aaba22f0a5a8290ba75809b522e4293822296b (patch) | |
| tree | bd3cb639b1612aa8ee4dcf47db1db5f7d981935d /libhb/audio_resample.h | |
| parent | d5cd2171f6bd69ec44d4568926728b890f7d1f97 (diff) | |
Move mixdown-> channel_layout/matrix_encoding translation to hb_audio_resample_init().
Unlike hb_audio_remap, hb_audio_resample will never be used in situations where we don't have a mixdown.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4923 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/audio_resample.h')
| -rw-r--r-- | libhb/audio_resample.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libhb/audio_resample.h b/libhb/audio_resample.h index c853fc2e2..3a01d8696 100644 --- a/libhb/audio_resample.h +++ b/libhb/audio_resample.h @@ -27,6 +27,7 @@ typedef struct { + int do_remix; int resample_needed; AVAudioResampleContext *avresample; @@ -59,14 +60,15 @@ typedef struct } hb_audio_resample_t; /* Initialize an hb_audio_resample_t for converting audio to the requested - * sample_fmt and channel_layout, using the specified matrix_encoding. + * sample_fmt and mixdown. * * 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 output_sample_fmt, - uint64_t output_channel_layout, - enum AVMatrixEncoding matrix_encoding, +hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt, + int hb_amixdown, int do_remix, int normalize_mix_level); /* The following functions set the audio input characteristics. |