From 1dac20933de015b9aeeee2c584efc60098f52c98 Mon Sep 17 00:00:00 2001 From: Simon Lämmle Date: Sat, 16 Jun 2018 14:23:48 +0200 Subject: libhb: Allow 7.1 channels AAC encoding. Allow 7.1 channels for AAC, but dissalow 6.1 for FDK (H)AAC, because it is not supported. --- libhb/common.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'libhb/common.c') diff --git a/libhb/common.c b/libhb/common.c index 403741410..bcb9761f6 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -1815,15 +1815,18 @@ int hb_mixdown_has_codec_support(int mixdown, uint32_t codec) case HB_ACODEC_FFFLAC: case HB_ACODEC_FFFLAC24: case HB_ACODEC_OPUS: + case HB_ACODEC_CA_AAC: + case HB_ACODEC_CA_HAAC: + case HB_ACODEC_FFAAC: return (mixdown <= HB_AMIXDOWN_7POINT1); case HB_ACODEC_LAME: return (mixdown <= HB_AMIXDOWN_DOLBYPLII); - case HB_ACODEC_CA_AAC: - case HB_ACODEC_CA_HAAC: + case HB_ACODEC_FDK_AAC: + case HB_ACODEC_FDK_HAAC: return ((mixdown <= HB_AMIXDOWN_5POINT1) || - (mixdown == HB_AMIXDOWN_5_2_LFE)); + (mixdown == HB_AMIXDOWN_7POINT1)); default: return (mixdown <= HB_AMIXDOWN_5POINT1); @@ -1968,6 +1971,11 @@ int hb_mixdown_get_default(uint32_t codec, uint64_t layout) case HB_ACODEC_FFFLAC: case HB_ACODEC_FFFLAC24: case HB_ACODEC_OPUS: + case HB_ACODEC_CA_AAC: + case HB_ACODEC_CA_HAAC: + case HB_ACODEC_FFAAC: + case HB_ACODEC_FDK_AAC: + case HB_ACODEC_FDK_HAAC: mixdown = HB_AMIXDOWN_7POINT1; break; -- cgit v1.2.3