Commit 8bef346d authored by multrus's avatar multrus
Browse files

[cleanup] accept CR_FIX_585_MASA_2TC_DTX_EXT

parent 3373a52d

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -5193,10 +5193,8 @@ void ivas_masa_prerender( 
    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                             */

    float *output[],                                            /* i/o: synthesized core-coder transport channels       */

    const int16_t output_frame                                  /* i  : output frame length per channel                 */

#ifdef CR_FIX_585_MASA_2TC_DTX_EXT

    ,

    const int16_t nchan_remapped                                /* i  : number of transports used in core               */

#endif

);



void ivas_spar_param_to_masa_param_mapping(

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 
/* any switch which is non-be wrt operation points tested in selection */

/* all switches in this category should start with "CR_" */



#define CR_FIX_585_MASA_2TC_DTX_EXT                     /* Nokia: issue 585: fixes transition artifacts in MASA 2TC DTX by applying correct condition */

#define CR_FIX_639_HQ_ACELP_TRANSITION                  /* Ericsson: Issue 639: Wrong sampling rate of SWB TBE excitation memory in 16 kHz core for DFT Stereo@32 kbps */

#define CR_FIX_586_BPF_DFT_MEM                          /* FhG: issue 586: set input memory of DFT analysis of BPF signal to zero for HQ core to fix issue with PLC and bitrate switching */

#define CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE /* FhG: fix for cng in ISM DTX on sudden silence periods */

lib_dec/ivas_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -509,11 +509,7 @@ ivas_error ivas_dec( 


        if ( st_ivas->ivas_format == MASA_FORMAT )

        {

#ifdef CR_FIX_585_MASA_2TC_DTX_EXT

            ivas_masa_prerender( st_ivas, output, output_frame, nchan_remapped );

#else

            ivas_masa_prerender( st_ivas, output, output_frame );

#endif

        }

        else if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

        {

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -297,11 +297,7 @@ ivas_error ivas_jbm_dec_tc( 


        if ( st_ivas->ivas_format == MASA_FORMAT )

        {

#ifdef CR_FIX_585_MASA_2TC_DTX_EXT

            ivas_masa_prerender( st_ivas, output, output_frame, nchan_remapped );

#else

            ivas_masa_prerender( st_ivas, output, output_frame );

#endif

        }

        else if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

        {

lib_dec/ivas_masa_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -843,17 +843,11 @@ void ivas_masa_prerender( 
    Decoder_Struct *st_ivas,   /* i/o: IVAS decoder handle                         */

    float *output[],           /* i/o: synthesized core-coder transport channels   */

    const int16_t output_frame /* i  : output frame length per channel             */

#ifdef CR_FIX_585_MASA_2TC_DTX_EXT

    ,

    const int16_t nchan_remapped /* i  : number of transports used in core          */

#endif

)

{

#ifdef CR_FIX_585_MASA_2TC_DTX_EXT

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_transport == 2 && nchan_remapped == 1 )

#else

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_transport == 2 && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE )

#endif

    {

        if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

        {