Commit 36861ede authored by emerit's avatar emerit
Browse files

Merge branch 'ivas-float-update' into 1813_ref_port_MR1524

parents 23f954f0 3626d8f2

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -630,6 +630,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

        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

               arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

        {

lib_com/common_api_types.h

+3 −1
Original line number Diff line number Diff line
@@ -325,7 +325,9 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

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



#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

+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

}
@@ -272,6 +277,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
@@ -2248,6 +2248,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



    hRenderConfig->split_rend_config = renderConfig.split_rend_config;