diff options
| author | Rodeo <[email protected]> | 2012-08-11 18:30:28 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-08-11 18:30:28 +0000 |
| commit | 833f974cc3b7b4a50f9c4a76686950a9dd395e70 (patch) | |
| tree | 907c967a203eb080eeb74ec57d5a6e4e4c6e81f2 | |
| parent | 3b80634a75354adf9e6c7ce1deb8dca8a5cad489 (diff) | |
Improve last commit. While the AC3 decoder doesn't use hb_ff_layout_xlat(), the code I added to it really belongs in hb_audio_resample.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4899 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/audio_resample.c | 5 | ||||
| -rw-r--r-- | libhb/hb.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libhb/audio_resample.c b/libhb/audio_resample.c index 45d2fdf42..94ab3b531 100644 --- a/libhb/audio_resample.c +++ b/libhb/audio_resample.c @@ -53,6 +53,11 @@ int hb_audio_resample_update(hb_audio_resample_t *resample, int ret, resample_changed; new_channel_layout = hb_ff_layout_xlat(new_channel_layout, new_channels); + if (new_channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX) + { + // Dolby Surround is Stereo when it comes to remixing + new_channel_layout = AV_CH_LAYOUT_STEREO; + } resample->resample_needed = (resample->resample_needed || diff --git a/libhb/hb.c b/libhb/hb.c index c51683c7c..cc9fd2279 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -266,11 +266,6 @@ uint64_t hb_ff_layout_xlat(uint64_t ff_channel_layout, int nchannels) ff_channel_layout, nchannels); } } - else if (hb_layout == AV_CH_LAYOUT_STEREO_DOWNMIX) - { - // Dolby is really only Stereo as far as downmixing is concerned - hb_layout = AV_CH_LAYOUT_STEREO; - } return hb_layout; } |