Commit de4008bc authored by fotopoulou's avatar fotopoulou
Browse files

Rename define with NONBE_ prefix instead of CR_

parent 7be1b682

lib_com/bitstream.c

+1 −1
Original line number Diff line number Diff line
@@ -2740,7 +2740,7 @@ ivas_error preview_indices( 
            /* Read SBA planar flag and SBA order */

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS] == 1 );



#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT

            if ( total_brate >= IVAS_256k )

#else

            if ( total_brate > IVAS_256k )

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -167,9 +167,7 @@ 


#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */

#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/





#define CR_FIX_752_OSBA_MISCONFIG_MCT                    /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/

#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                    /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/

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



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1531,7 +1531,7 @@ ivas_error ivas_init_decoder( 
            st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */

            st_ivas->hCPE[0]->hCoreCoder[1] = NULL;

        }

#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT

        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            st_ivas->nchan_transport += st_ivas->nchan_ism;
@@ -1544,7 +1544,7 @@ ivas_error ivas_init_decoder( 
                return error;

            }

        }

#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT

        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            st_ivas->nchan_transport -= st_ivas->nchan_ism;

lib_dec/ivas_mct_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ ivas_error create_mct_dec( 
    if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

        hMCT->nchan_out_woLFE = st_ivas->nchan_transport;

#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT

        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            hMCT->nchan_out_woLFE += st_ivas->nchan_ism;
@@ -372,7 +372,7 @@ ivas_error create_mct_dec( 


    cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS;



#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT

    if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

    {

        cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS;
@@ -472,7 +472,7 @@ ivas_error mct_dec_reconfigure( 
        if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )

        {

            hMCT->nchan_out_woLFE = st_ivas->nchan_transport;

#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT

            if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

            {

                hMCT->nchan_out_woLFE += st_ivas->nchan_ism;
@@ -509,7 +509,7 @@ ivas_error mct_dec_reconfigure( 
    }



    cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS;

#ifdef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT

    if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

    {

        cp_bitrate = st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport * CPE_CHANNELS;

lib_dec/ivas_sba_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ ivas_error ivas_sba_dec_reconfigure( 
                return error;

            }



#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT

            st_ivas->nchan_transport += st_ivas->nchan_ism;

#endif

            st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1;
@@ -444,14 +444,14 @@ ivas_error ivas_sba_dec_reconfigure( 
                    }

                }

            }

#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT

            nchan_transport_old += st_ivas->nchan_ism;

#endif

            st_ivas->ism_mode = ISM_MODE_NONE;

        }

        else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT

            st_ivas->nchan_transport += st_ivas->nchan_ism;

#endif

            st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1;
@@ -464,7 +464,7 @@ ivas_error ivas_sba_dec_reconfigure( 
    {

        return error;

    }

#ifndef CR_FIX_752_OSBA_MISCONFIG_MCT

#ifndef NONBE_FIX_752_OSBA_MISCONFIG_MCT

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )