Commit ba70bae2 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

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

Merge remote-tracking branch 'origin/main' into 987-parammc-and-paramupmix-binaural-room-reverb-with-head-rotation-energy-not-correct
parents fb9ee4f7 652e1ce2

lib_com/options.h

+3 −2
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */

#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER                  /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS                  /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */



//#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING_A     /* FhG: issue 987: solution a: switch to SD */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING_B       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

lib_dec/ivas_masa_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -142,6 +142,13 @@ ivas_error ivas_masa_decode( 
        st->next_bit_pos = (int16_t) ( ( masa_brate / FRAMES_PER_SEC ) - 1 );

    }



#ifdef NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS

    if ( ivas_format == MASA_FORMAT && ( masa_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) )

    {

        hMasa->config.numberOfDirections = 1;

    }

#endif



    if ( !st->bfi && ivas_total_brate > IVAS_SID_5k2 )

    {

        if ( !( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) )