Commit dd869ce9 authored by vaclav's avatar vaclav
Browse files

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

Merge remote-tracking branch 'remotes/origin/main' into 649-renderer-application-dependency-on-prot-h
parents 36435f67 45be697e

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ 
#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PRED_QUANT_63_PNTS

#define SPLIT_REND_WITH_HEAD_ROT_PARAMBIN               /* Nokia: Issue 623: Split rendering support for parambin renderer */

#define FIX_658_SPLIT_REND_MASA                         /*Dlb : Fix for issue 658, uninitialized memory access in MASA in Split rendering 0DOF mode*/                 

#endif

#define FIX_594_STL_INCLUDE                             /* FhG: issue 594: Missing include of stl.h */
@@ -213,6 +214,7 @@ 
#define FIX_549_PARAM_ISM_BIN_GAIN                      /* FhG: Issue 549 : fix too quiet binaural output in ParamISM */

#define FIX_618_STEREO_SW_DIV_BY_ZERO                   /* VA: fix issue 618 - UBSAN: division-by-zero in stereo bitrate switching */

#define FIX_625_IDX_OOB                                 /* FhG: Fix index out-of-bounds UBSAN error (issue 625) */

#define FIX_613_DIRAC_NULL_PTR_USAN                     /* Nokia: Issue #613: USAN in DirAC decoder setup */



#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -555,6 +555,10 @@ ivas_error ivas_jbm_dec_tc( 
        st_ivas->ini_active_frame++;

    }



#ifdef MASA_AND_OBJECTS

    st_ivas->last_ivas_format = st_ivas->ivas_format;

#endif



#ifdef DEBUG_MODE_INFO

    dbgwrite( &st_ivas->bfi, sizeof( int16_t ), 1, output_frame, "res/bfi" );

    dbgwrite( &st_ivas->BER_detect, sizeof( int16_t ), 1, output_frame, "res/BER_detect" );

lib_dec/ivas_omasa_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmc_auto.h"





#ifdef MASA_AND_OBJECTS

lib_dec/ivas_stereo_ica_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ void stereo_tca_dec( 


    prevNCShift = (int16_t) abs( hStereoTCA->prevCorrLagStats );

    currentNCShift = (int16_t) abs( hStereoTCA->corrLagStats );

    /* IVAS_fmToDo: QCTodo: Need to address [16, 32] kHz @ Encoder --> 48 kHz Decoder. 48kHz-->48kHz is ok */

    /*target_idx = (hStereoTCA->refChanIndx == L_CH_INDX) ? R_CH_INDX : L_CH_INDX;*/



    if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_TD )

    {

lib_dec/ivas_stereo_icbwe_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -312,12 +312,6 @@ void stereo_icBWE_dec( 
    specMapping = hStereoICBWE->prevSpecMapping;

    gsMapping = hStereoICBWE->prevgsMapping;



#ifdef QC_DBG_ICBWE

    dbgwrite( &hStereoICBWE->refChanIndx_bwe, 2, 1, 1, "refChanIndx_bwe_dec.pcm" );

    dbgwrite( &specMapping, 4, 1, 1, "spMapping_dec.pcm" );

    dbgwrite( &gsMapping, 4, 1, 1, "gsMapping_dec.pcm" );

#endif



    if ( ( st->extl == SWB_TBE || st->extl == FB_TBE ) && st->flag_ACELP16k == 1 )

    {

        mvr2r( voice_factors, nlMixFac, NB_SUBFR16k );
@@ -739,7 +733,6 @@ void stereo_icBWE_decproc( 
            {

                if ( hCPE->element_mode == IVAS_CPE_TD )

                {

                    /* QC: TODO - TBV */

                    v_add( output[0], hStereoICBWE->memOutHB[hStereoICBWE->prev_refChanIndx_bwe], output[0], memOffset );

                    v_add( output[1], hStereoICBWE->memOutHB[!hStereoICBWE->prev_refChanIndx_bwe], output[1], memOffset );

                }