Commit f9978bff authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1209_SID_SIGNALING

parent c9fb3b83

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -269,11 +269,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

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

#else

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

#endif

#define SID_SBA_1TC                             0x5                         /*      1|      0|     1 */

#define SID_SBA_2TC                             0x6                         /*      0|      1|     1 */

#define SID_MASA_2TC                            0x7                         /*      1|      1|     1 */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 


#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

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

#define NONBE_1250_MCMASA_LS_OUTPUT                     /* VA: issue 1250: fix crash in McMASA to custom LS output decoding */

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

lib_dec/ivas_init_dec_fx.c

+0 −15
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ static AUDIO_CONFIG ivas_set_audio_config_from_sba_order( 
}





#ifdef FIX_1209_SID_SIGNALING

/*---------------------------------------------------------------------*

 * ivas_dec_get_format( )

 *
@@ -516,7 +515,6 @@ ivas_error ivas_dec_get_format_fx( 


    return IVAS_ERR_OK;

}

#endif





/*-------------------------------------------------------------------*
@@ -554,14 +552,10 @@ ivas_error ivas_dec_setup( 
     * Read IVAS format

     *-------------------------------------------------------------------*/



#ifdef FIX_1209_SID_SIGNALING

    IF( ( error = ivas_read_format( st_ivas, &num_bits_read ) ) != IVAS_ERR_OK )

    {

        return error;

    }

#else

    ivas_read_format( st_ivas, &num_bits_read );

#endif



    /*-------------------------------------------------------------------*

     * Read other signling (ISM/MC mode, number of channels, etc.)
@@ -1192,12 +1186,6 @@ static ivas_error ivas_read_format( 
                st_ivas->ivas_format = ISM_FORMAT;

                move32();

                BREAK;

#ifndef FIX_1209_SID_SIGNALING

            case SID_MULTICHANNEL:

                st_ivas->ivas_format = MC_FORMAT;

                move32();

                BREAK;

#endif

            case SID_SBA_1TC:

                st_ivas->ivas_format = SBA_FORMAT;

                move32();
@@ -1233,9 +1221,6 @@ static ivas_error ivas_read_format( 
                }

                BREAK;

            default:

#ifndef 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 );

        }

lib_enc/ivas_init_enc_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -183,12 +183,6 @@ void ivas_write_format_sid_fx( 
            ind = SID_ISM;

            move16();

            BREAK;

#ifndef FIX_1209_SID_SIGNALING

        case MC_FORMAT:

            ind = SID_MULTICHANNEL;

            move16();

            BREAK;

#endif

        case SBA_FORMAT:

            SWITCH( element_mode )

            {