Commit 46a554ad authored by multrus's avatar multrus
Browse files

[cleanup] accept CONF_DISTATT

parent 043f3f7d

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -663,13 +663,11 @@ int main( 
            goto cleanup;

        }



#ifdef CONF_DISTATT

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

        {

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

            goto cleanup;

        }

#endif



        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

        {

lib_com/common_api_types.h

+0 −2
Original line number Diff line number Diff line
@@ -327,9 +327,7 @@ typedef struct _IVAS_RENDER_CONFIG 
    IVAS_ROOM_ACOUSTICS_CONFIG_DATA roomAcoustics;

    ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;

    float directivity[IVAS_MAX_NUM_OBJECTS * 3];

#ifdef CONF_DISTATT

    float distAtt[3];

#endif

} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;



typedef struct

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 


/* #################### Start BASOP porting switches ############################ */



#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */ 

#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/

lib_dec/ivas_objectRenderer_internal.c

+0 −7
Original line number Diff line number Diff line
@@ -61,13 +61,8 @@ ivas_error ivas_td_binaural_open( 
        num_src = st_ivas->nchan_ism;

    }



#ifdef CONF_DISTATT

    return ivas_td_binaural_open_unwrap( &st_ivas->hHrtfTD, st_ivas->hDecoderConfig->output_Fs, num_src, st_ivas->ivas_format,

                                         st_ivas->transport_config, st_ivas->hRenderConfig->directivity, st_ivas->hRenderConfig->distAtt, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns );

#else

    return ivas_td_binaural_open_unwrap( &st_ivas->hHrtfTD, st_ivas->hDecoderConfig->output_Fs, num_src, st_ivas->ivas_format,

                                         st_ivas->transport_config, st_ivas->hRenderConfig->directivity, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns );

#endif

}
@@ -286,9 +281,7 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
                                                     st_ivas->ivas_format,

                                                     st_ivas->transport_config,

                                                     st_ivas->hRenderConfig->directivity,

#ifdef CONF_DISTATT

                                                     st_ivas->hRenderConfig->distAtt,

#endif

                                                     st_ivas->hTransSetup,

                                                     &st_ivas->hTdRendHandles[i],

                                                     &st_ivas->binaural_latency_ns ) ) != IVAS_ERR_OK )

lib_dec/lib_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -2311,9 +2311,7 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
    }



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

#ifdef CONF_DISTATT

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

#endif



    hRenderConfig->split_rend_config = renderConfig.split_rend_config;