Commit 10d5c6e2 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 539-chirp-artifacts-in-MASA-at-384-kbps-for-a-specific-sample
parents 91752373 eaa1b17e

lib_com/ivas_cnst.h

+8 −0
Original line number Diff line number Diff line
@@ -1582,14 +1582,22 @@ typedef enum 
typedef enum

{

    TDREND_POSTYPE_ABSOLUTE,                                                /* The source position is in absolute coordinates  */

#ifdef FIX_550_FIRST_FRAME_ACCESS_ALT

    TDREND_POSTYPE_NON_DIEGETIC                                             /* The source position is non-diegetic */

#else

    TDREND_POSTYPE_RELATIVE_TO_LISTENER                                     /* The source position is relative to the listener */

#endif

} TDREND_PosType_t;



typedef enum

{

    TDREND_PLAYSTATUS_INITIAL,

#ifndef FIX_550_FIRST_FRAME_ACCESS_ALT

    TDREND_PLAYSTATUS_PLAYING,

    TDREND_PLAYSTATUS_PLAYING_NON_DIEGETIC

#else

    TDREND_PLAYSTATUS_PLAYING

#endif

} TDREND_PlayStatus_t;



typedef enum

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -5142,6 +5142,10 @@ 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 CR_FIX_585_MASA_2TC_DTX_EXT

    ,

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

#endif

);

lib_com/options.h

100644 → 100755
+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ 
#define FIX_UNCLR_ISSUE                                 /* VoiceAge: issue 574: Fix UNCLR mis-classifications in noisy speech stereo */

#define FIX_TCX_LOWRATE_LIMITATION                      /* VA: issue 577: TCX bitrate limitation only when DEBUGGING is active */

#define FIX_575_LOW_OVERLAP_PLC_RECOVERY                /* FhG: Issue 575 fix for PLC and transistion to TCX5*/

#define FIX_550_FIRST_FRAME_ACCESS                      /* Eri: Issue 550: TD Object renderer: first frame accesses wrong transport channel offsets */

#define FIX_550_FIRST_FRAME_ACCESS_ALT                  /* Eri: Issue 550: Should be merged with FIX_550_FIRST_FRAME_ACCESS above, or accepted at the same time */

#define FIX_569_TD_FILTER_LENGTH                        /* Eri: Issue 569: If an HRTF binary file exceeds the SFX_SPAT_BIN_MAX_FILTER_LENGTH the decoder crashes. This truncates the filter when generated from the model.  */

#define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */

#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */
@@ -182,6 +184,7 @@ 
/* #################### 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

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

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

        {