diff options
| author | Simon Lämmle <[email protected]> | 2018-06-16 14:23:48 +0200 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-16 11:01:59 -0400 |
| commit | 1dac20933de015b9aeeee2c584efc60098f52c98 (patch) | |
| tree | 009c6d7f2266aa06fe8d6ee5beda91d2698136cf /libhb | |
| parent | 94b71f9a7a37801cfe06a5cb37365a446d875449 (diff) | |
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.
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/common.c | 14 |
1 files changed, 11 insertions, 3 deletions
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; |