Commit 1aceaaa6 authored by vaclav's avatar vaclav
Browse files

accept switches FIX_938_COMPILER_WARNING, FIX_1288_SPLIT_REND_XSAN,... 

accept switches FIX_938_COMPILER_WARNING, FIX_1288_SPLIT_REND_XSAN, NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND, and NONBE_1329_FIX_OSBA_CRASH
parent 81526f7f

apps/renderer.c

+3 −2
Original line number Diff line number Diff line
@@ -1081,18 +1081,19 @@ int main( 
            fprintf( stderr, "\nFailed to read renderer configuration from file %s\n", args.renderConfigFilePath );

            goto cleanup;

        }

#ifdef NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND



        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", args.directivityPatternId[0], args.directivityPatternId[1], args.directivityPatternId[2], args.directivityPatternId[3] );

            goto cleanup;

        }



        if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get Distance Attenuation \n\n" );

            goto cleanup;

        }

#endif



        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            aeID = args.aeSequence.count > 0 ? args.aeSequence.pID[0] : 65535;

lib_com/options.h

+1 −5
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ 


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

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */

#define FIX_1288_SPLIT_REND_XSAN                        /* Dlb: Fix asan, msan and usan issues in split rendering mode*/



/* #################### End BE switches ################################## */
@@ -174,8 +172,6 @@ 


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_1339_FIXOSBA_EXT_LOUDNESS                 /* FhG: issue 1339: apply scaling with EXT output in OSBA high-BR mode */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_init_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -2782,11 +2782,8 @@ void ivas_destroy_dec( 
    ivas_dirac_dec_close_binaural_data( st_ivas->hDiracDecBin );



    /* Crend handle */

#ifndef FIX_1288_SPLIT_REND_XSAN

    ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );

#else

    ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

#endif



    /* Reverb handle */

    ivas_reverb_close( &st_ivas->hReverb );

lib_dec/ivas_ism_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -253,11 +253,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
            }



            /* close the crend binaural renderer */

#ifndef FIX_1288_SPLIT_REND_XSAN

            ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );

#else

            ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

#endif

        }

    }

lib_dec/ivas_mct_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -1161,6 +1161,7 @@ static ivas_error ivas_mc_dec_reconfig( 
            if ( st_ivas->hBinRenderer != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM ) )

            {

                ivas_binRenderer_close( &st_ivas->hBinRenderer );



                if ( ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )

                {

                    efap_free_data( &st_ivas->hEFAPdata );
@@ -1169,11 +1170,7 @@ static ivas_error ivas_mc_dec_reconfig( 


            if ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hCrend[0] != NULL ) && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD || st_ivas->hIntSetup.output_config != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )

            {

#ifndef FIX_1288_SPLIT_REND_XSAN

                ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );

#else

                ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

#endif

            }



            if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )