summaryrefslogtreecommitdiffstats
path: root/libhb/declpcm.c
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-08-02 21:43:22 +0000
committerRodeo <[email protected]>2012-08-02 21:43:22 +0000
commitb3717d369763d620d548f224daeba5a7503fa972 (patch)
tree4742e9b49e03db2b1c558e10f40c2c821528e8f5 /libhb/declpcm.c
parentad257c9dac38fe3f7502b1058247b4458465c0a8 (diff)
Use hb_audio_resample for downmixing AC3 sources. DRC is still applied by liba52.
Add support for center & surround mix levels to hb_audio_resample. This allows us to support upmixing all audio sources. For sources that have at least 2 front and one back or side channel(s), allow upmixing to 5.1: 3.0/3.1 (2 front and 1 back channels) 4.0/4.1 (3 front and 1 back channels) 4.0/4.1 (2 front and 2 side channels) 5.0 (3 front and 2 side channels) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4885 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/declpcm.c')
-rw-r--r--libhb/declpcm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libhb/declpcm.c b/libhb/declpcm.c
index 0d4e449d1..1511a6abd 100644
--- a/libhb/declpcm.c
+++ b/libhb/declpcm.c
@@ -331,7 +331,8 @@ static hb_buffer_t *Decode( hb_work_object_t *w )
hb_buffer_t *out;
hb_audio_resample_update(pv->resample, AV_SAMPLE_FMT_FLT,
- hdr2layout[pv->nchannels - 1], pv->nchannels);
+ hdr2layout[pv->nchannels - 1], HB_MIXLEV_DEFAULT,
+ HB_MIXLEV_DEFAULT, pv->nchannels);
out = hb_audio_resample(pv->resample, (void*)pv->data, pv->nsamples);
if (out == NULL)
{