Commit ce6732e6 authored by emerit's avatar emerit
Browse files

Merge branch 'orange/no-diegetic-pan-with-radius' of... 

Merge branch 'orange/no-diegetic-pan-with-radius' of forge.3gpp.org:ivas-codec-pc/ivas-codec into orange/no-diegetic-pan-with-radius
parents ae56f3d4 e49d7dd0

lib_com/hq_tools.c

+0 −1
Original line number Diff line number Diff line
@@ -1290,7 +1290,6 @@ int16_t calc_nor_delta_hf( 
                ynrm[i] += delta;

                add_bits_denv += bitsforDelta;





                temp_num++;

            }

        }

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -137,10 +137,8 @@ 


#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



#define NON_DIEGETIC_PAN                                /* implentation of non diegetic panning in decoder */

#define ISM_NON_DIEGETIC_PAN                            /* implentation of non diegetic panning for ism objects */



#define FIX_103_RA_PARAMS_PARAM_BIN_REND                /* Issue 103: Digest room acoustics parameters for Parametric Binaural Renderer*/

/*#define SBA_HPF_TUNING_DEC*/

#define SMOOTH_WITH_TRANS_DET

lib_dec/ivas_ism_metadata_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -984,7 +984,6 @@ void ivas_ism_metadata_sid_dec( 
        for ( ch = 0; ch < nchan_ism; ch++ )

        {

            hIsmMetaData = hIsmMeta[ch];



            if ( md_diff_flag[ch] == 1 )

            {

                /* Azimuth decoding */

lib_rend/ivas_objectRenderer.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ void TDREND_Update_object_positions( 
            if ( hIsmMetaData[nS]->non_diegetic_flag )

            {

                Pos[0] = 0;

                Pos[1] = hIsmMetaData[nS]->azimuth / 90.f;

                Pos[1] = -hIsmMetaData[nS]->azimuth / 90.f;

                Pos[2] = 0;

                TDREND_MIX_SRC_SetPos( hBinRendererTd, nS, Pos );

                TDREND_MIX_SRC_SetPlayState( hBinRendererTd, nS, TDREND_PLAYSTATUS_PLAYING_NON_DIEGETIC );

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -3821,7 +3821,7 @@ int16_t IVAS_REND_FeedRenderConfig( 
    mvr2r( renderConfig.room_acoustics.pFc_input, hRenderConfig->roomAcoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );

    mvr2r( renderConfig.room_acoustics.pAcoustic_rt60, hRenderConfig->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );

    mvr2r( renderConfig.room_acoustics.pAcoustic_dsr, hRenderConfig->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );

#ifdef NON_DIEGETIC_PAN

#ifdef ISM_NON_DIEGETIC_PAN

    mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 );

#endif

lib_util/ism_file_reader.c

+2 −2

File changed.

Contains only whitespace changes.

lib_enc/lib_enc.c

+1 −1

File changed.

Contains only whitespace changes.