From d8b1fd4ad0233fc69a58ac6f91e1d154f22c481b Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Sun, 29 Oct 2017 00:58:23 -0400 Subject: [PATCH] Enable RFC 8251 changes by default --- celt/bands.c | 4 ++-- celt/celt_decoder.c | 2 +- configure.ac | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/celt/bands.c b/celt/bands.c index 3b1f5cfb..950b727c 100644 --- a/celt/bands.c +++ b/celt/bands.c @@ -1507,7 +1507,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end, b = 0; } -#ifdef ENABLE_UPDATE_DRAFT +#ifndef DISABLE_UPDATE_DRAFT if (resynth && (M*eBands[i]-N >= M*eBands[start] || i==start+1) && (update_lowband || lowband_offset==0)) lowband_offset = i; if (i == start+1) @@ -1541,7 +1541,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end, fold_start = lowband_offset; while(M*eBands[--fold_start] > effective_lowband+norm_offset); fold_end = lowband_offset-1; -#ifdef ENABLE_UPDATE_DRAFT +#ifndef DISABLE_UPDATE_DRAFT while(++fold_end < i && M*eBands[fold_end] < effective_lowband+norm_offset+N); #else while(M*eBands[++fold_end] < effective_lowband+norm_offset+N); diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c index 10958a51..944b5e10 100644 --- a/celt/celt_decoder.c +++ b/celt/celt_decoder.c @@ -164,7 +164,7 @@ OPUS_CUSTOM_NOSTATIC int opus_custom_decoder_init(CELTDecoder *st, const CELTMod st->start = 0; st->end = st->mode->effEBands; st->signalling = 1; -#ifdef ENABLE_UPDATE_DRAFT +#ifndef DISABLE_UPDATE_DRAFT st->disable_inv = channels == 1; #else st->disable_inv = 0; diff --git a/configure.ac b/configure.ac index 299181c1..fc80275a 100644 --- a/configure.ac +++ b/configure.ac @@ -804,12 +804,12 @@ AC_ARG_ENABLE([extra-programs], AM_CONDITIONAL([EXTRA_PROGRAMS], [test "$enable_extra_programs" = "yes"]) -AC_ARG_ENABLE([update-draft], - AS_HELP_STRING([--enable-update-draft], [Enable bitstream changes from draft-ietf-codec-opus-update]),, - [enable_update_draft=no]) +AC_ARG_ENABLE([rfc8251], + AS_HELP_STRING([--disable-rfc8251], [Disable bitstream fixes from RFC 8251]),, + [enable_rfc8251=yes]) -AS_IF([test "$enable_update_draft" = "yes"], [ - AC_DEFINE([ENABLE_UPDATE_DRAFT], [1], [Enable bitstream changes from draft-ietf-codec-opus-update]) +AS_IF([test "$enable_rfc8251" = "no"], [ + AC_DEFINE([DISABLE_UPDATE_DRAFT], [1], [Disable bitstream fixes from RFC 8251]) ])