Commit 67f238f0 authored by vaclav's avatar vaclav
Browse files

rename FIX_1209_SID_SIGNALING to NONBE_FIX_1209_SID_SIGNALING

parent d556e14d

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ typedef enum 
#define SID_MDCT_STEREO                         0x1                         /*      1|      0|     0 */

#define SID_ISM                                 0x2                         /*      0|      1|     0 */

#define SID_MASA_1TC                            0x3                         /*      1|      1|     0 */

#ifdef FIX_1209_SID_SIGNALING

#ifdef NONBE_FIX_1209_SID_SIGNALING

/*reserved*/                                  /*0x4*/                       /*      0|      0|     1 */

#else

#define SID_MULTICHANNEL                        0x4                         /*      0|      0|     1 */

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 
#define FIX_587_DEFAULT_REVERB                          /* Philips: issue 587: inconsistent default reverb parameters across renderers */



#define FIX_HRTF_LOAD                                   /* VA: issue 1187: fix memory issue when HRTFs are loaded from a binary file */

#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */



/* #################### End BE switches ################################## */
@@ -187,6 +186,7 @@ 


#define FIX_1139_REV_COLORATION_SHORT_T60               /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */

#define FIX_1206_ZERO_OUT_IMDCT_BUFFERS_FOR_MCT_IGNORE  /* FhG: zero out all relevant imdct buffers in MCT decoding of channels with mct_chan_mode == MCT_CHAN_MODE_IGNORE */

#define NONBE_FIX_1209_SID_SIGNALING                    /* VA: issue 1209: remove dead code in IVAS SID signaling */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_init_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static ivas_error ivas_read_format( 
            case SID_ISM:

                st_ivas->ivas_format = ISM_FORMAT;

                break;

#ifndef FIX_1209_SID_SIGNALING

#ifndef NONBE_FIX_1209_SID_SIGNALING

            case SID_MULTICHANNEL:

                st_ivas->ivas_format = MC_FORMAT;

                break;
@@ -1066,7 +1066,7 @@ static ivas_error ivas_read_format( 
                }

                break;

            default:

#ifndef FIX_1209_SID_SIGNALING

#ifndef NONBE_FIX_1209_SID_SIGNALING

                /* This should actually be impossible, since only 3 bits are read, so if this happens something is broken */

#endif

                return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Invalid value %c found in SID format field.", st_ivas->sid_format );
@@ -1082,8 +1082,8 @@ static ivas_error ivas_read_format( 
            st_ivas->sba_order = st_ivas->bit_stream[*num_bits_read + 1];

            st_ivas->sba_order += 2 * st_ivas->bit_stream[*num_bits_read];

            *num_bits_read += SBA_ORDER_BITS;

#ifdef FIX_1209_SID_SIGNALING

            st_ivas->sba_analysis_order = SBA_FOA_ORDER; /* Hard coding as DTX is supported with FOA analysis order only */

#ifdef NONBE_FIX_1209_SID_SIGNALING

            st_ivas->sba_analysis_order = SBA_FOA_ORDER; /* Hard coded DTX is supported with FOA analysis order only */

#else

            if ( st_ivas->sba_analysis_order == 0 )

            {

lib_enc/ivas_init_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ void ivas_write_format_sid( 
        case ISM_FORMAT:

            ind = SID_ISM;

            break;

#ifndef FIX_1209_SID_SIGNALING

#ifndef NONBE_FIX_1209_SID_SIGNALING

        case MC_FORMAT:

            ind = SID_MULTICHANNEL;

            break;