Commit 7a8e8c97 authored by vasilache's avatar vasilache
Browse files

Merge branch 'main' into 1074-number-of-objects-signaling-correction-in-omasa-low-rate

parents d7b06971 b6ec764e

apps/decoder.c

+7 −1
Original line number Diff line number Diff line
@@ -660,7 +660,13 @@ int main( 
            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );

            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

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

               arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

lib_com/common_api_types.h

+3 −0
Original line number Diff line number Diff line
@@ -335,6 +335,9 @@ typedef struct _IVAS_RENDER_CONFIG 
    ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;

#endif

    float directivity[IVAS_MAX_NUM_OBJECTS * 3];

#ifdef CONF_DISTATT

    float distAtt[3];

#endif



} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;

lib_com/options.h

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


#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */



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

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */



#define FIX_1077_MEMORY_TEST_MISSING                    /* orange: issue 1077 : add missing memory test*/

lib_dec/ivas_objectRenderer_internal.c

+8 −0
Original line number Diff line number Diff line
@@ -61,8 +61,13 @@ 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

}
@@ -271,6 +276,9 @@ 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

+3 −0
Original line number Diff line number Diff line
@@ -2307,6 +2307,9 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
#endif



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

#ifdef CONF_DISTATT

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

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

    hRenderConfig->split_rend_config = renderConfig.split_rend_config;