Commit 044dd2d3 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

renamed switch from FIX_585_MASA_2TC_DTX_EXT to CR_FIX_585_MASA_2TC_DTX_EXT... 

renamed switch from FIX_585_MASA_2TC_DTX_EXT to CR_FIX_585_MASA_2TC_DTX_EXT since the behaviour in selection test operation points will be changed
parent 16f67c3c

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -5121,7 +5121,7 @@ void ivas_masa_prerender( 
    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                             */

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

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

#ifdef FIX_585_MASA_2TC_DTX_EXT

#ifdef CR_FIX_585_MASA_2TC_DTX_EXT

    ,

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

#endif

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -170,11 +170,11 @@ 


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



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



/* #################### Start NON-BE CR switches ########################## */

/* 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 */





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

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ ivas_error ivas_dec( 


        if ( st_ivas->ivas_format == MASA_FORMAT )

        {

#ifdef FIX_585_MASA_2TC_DTX_EXT

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

lib_dec/ivas_jbm_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ ivas_error ivas_jbm_dec_tc( 


        if ( st_ivas->ivas_format == MASA_FORMAT )

        {

#ifdef FIX_585_MASA_2TC_DTX_EXT

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

lib_dec/ivas_masa_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -566,13 +566,13 @@ void ivas_masa_prerender( 
    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder handle                         */

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

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

#ifdef FIX_585_MASA_2TC_DTX_EXT

#ifdef CR_FIX_585_MASA_2TC_DTX_EXT

    ,

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

#endif

)

{

#ifdef FIX_585_MASA_2TC_DTX_EXT

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