Enable RFC 8251 changes by default

This commit is contained in:
Jean-Marc Valin 2017-10-29 00:58:23 -04:00
parent 9f7e7c8ce0
commit d8b1fd4ad0
No known key found for this signature in database
GPG key ID: 5E5DD9A36F9189C8
3 changed files with 8 additions and 8 deletions

View file

@ -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);

View file

@ -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;

View file

@ -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])
])