Commit 03d198e1 authored by Shikha Shetgeri's avatar Shikha Shetgeri
Browse files

Merge branch 'main' into FIX_331_ALL_BRS

parents 7b1e8d8a 998c3935

lib_com/options.h

+3 −2
Original line number Diff line number Diff line
@@ -166,13 +166,14 @@ 
#define FIX_392_LATE_REVERB                             /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/



#define FIX_ISM_DTX_CLICKS                              /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */



#define ISSUE_24_CLEANUP_MCT_LFE                        /* Issue 24: Cleanup LFE path withing MCT */



#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */



#define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */

#define FIX_406_IVAS_POSITION                           /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */







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

/* clang-format on */

lib_dec/ivas_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -266,7 +266,15 @@ ivas_error ivas_dec( 
                /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */

                ivas_ism_render( st_ivas, output, output_frame );

            }

#ifdef REND_DEBUGGING_REVISION

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

#endif

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

#endif

            {

                /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */

#ifdef NCHAN_ISM_PARAMETER

lib_dec/ivas_output_config.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void ivas_renderer_select( 
                else

                {

                    *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;

#if defined( DEBUGGING )

#ifdef DEBUGGING

                    if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV )

                    {

                        *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;

scripts/config/self_test.prm

+2 −2
Original line number Diff line number Diff line
@@ -420,11 +420,11 @@ 




// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, directivity configuration, random FEC at 5%

../IVAS_cod -ism +4 testv/stvISM+1.csv testv/stvISM+2.csv testv/stvISM+3.csv testv/stvISM+4.csv 256000 48 testv/stv4ISM48s.wav bit

../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit

../IVAS_dec -fec 5 -render_config testv/config_directivity.cfg -t testv/headrot_case04_3000_q.csv BINAURAL 48 bit testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_DirConfig_FEC5.tst



// 4 ISM with and without extended metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out

../IVAS_cod -dtx -ism +4 testv/stvISM+1.csv NULL testv/stvISM+3.csv testv/stvISM+4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit

../IVAS_cod -dtx -ism +4 testv/stvISM1.csv NULL testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit

../IVAS_dec BINAURAL 48 bit testv/stv+4ISM48s.wav_brate_sw_48-48_DTX_binaural.tst

scripts/testv/stvISM+1.csv

deleted100644 → 0
+0 −1500

File deleted.

Preview size limit exceeded, changes collapsed.