Commit 2969a363 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution
parents 2b42f479 91891f74

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ int main( 
            int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            for ( sf_idx = 0; sf_idx < num_subframes; sf_idx++ )

            {

                if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &quatBuffer[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )

                if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &quatBuffer[sf_idx], &enableHeadRotation[sf_idx], &enableExternalOrientation[sf_idx], &enableRotationInterpolation[sf_idx], &numFramesToTargetOrientation[sf_idx] ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Error in External Orientation File Reading: %s\n", ivas_error_to_string( error ) );

                    exit( -1 );

lib_com/ivas_prot.h

+1 −4
Original line number Diff line number Diff line
@@ -5140,11 +5140,8 @@ ivas_error ivas_allocate_binaural_hrtf( 
    HRTFS_FASTCONV *HrtfFastConv,                               /* i/o: FASTCONV HRTF structure */

    const AUDIO_CONFIG input_config,                            /* i  : input audio configuration                       */

    const BINAURAL_INPUT_AUDIO_CONFIG bin_input_config,         /* i  : binaural input audio config                     */

    const RENDERER_TYPE renderer_type                           /* i  : renderer type                                   */

#ifndef FIX_1123_FASTCONV_16BIT_ROM

    ,

    const RENDERER_TYPE renderer_type,                          /* i  : renderer type                                   */

    const int16_t allocate_init_flag                            /* i  : Memory allocation flag                          */

#endif

);



#ifdef DEBUGGING

lib_com/options.h

+1 −4
Original line number Diff line number Diff line
@@ -164,13 +164,9 @@ 


#define FIX_POINT_HRTF_FILE_FORMAT                     /* All: fix point hrtf binary file format */

#ifdef FIX_POINT_HRTF_FILE_FORMAT

/*#define FIX_1123_CREND_16BIT_ROM*/                    /* Ora: update CREND ROM tables to 16 bit */

#define FIX_1123_CREND_16BIT_FMT                        /* Ora: update CREND binary file format to 16 bit */

#define FIX_1123_CREND_FLTFX_BE                         /* Ora: make CREND FLT ROM tables BE to FX file */

/*#define FIX_1123_TDREN_16BIT_ROM*/                    /* Eri,Ora: update TD Object Renderer tables to 16 bit */

/*#define FIX_1123_FASTCONV_16BIT_ROM*/                 /* FhG: issue 1123: update FastConv ROM tables to 16 bit (must regenerate ROM file!) */

#define FIX_1123_FASTCONV_16BIT_FMT                     /* FhG: issue 1123: update FastConv binary file format and scripts to 16 bit */

/*#define FIX_1123_PARAMBIN_16BIT_ROM*/                 /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */

#define FIX_RETURN                                      /* VA: fix location of function returns */

#endif

#define FIX_1135_EXT_RENDERER_HANDLES                   /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */
@@ -188,6 +184,7 @@ 




#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN                     /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */



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

lib_dec/ivas_binRenderer_internal.c

+31 −211

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_masa_dec.c

+16 −0
Original line number Diff line number Diff line
@@ -1322,7 +1322,12 @@ ivas_error ivas_masa_dec_reconfigure( 
    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;

    last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;



#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN

    /* Copy state to TC buffer if granularity matches and we are not in OMASA EXT rendering mode */

    if ( st_ivas->hSpatParamRendCom != NULL && st_ivas->hSpatParamRendCom->slot_size == st_ivas->hTcBuffer->n_samples_granularity && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

#else

    if ( st_ivas->hSpatParamRendCom != NULL && st_ivas->hSpatParamRendCom->slot_size == st_ivas->hTcBuffer->n_samples_granularity )

#endif

    {

        mvs2s( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

        st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;
@@ -1343,6 +1348,16 @@ ivas_error ivas_masa_dec_reconfigure( 
            return error;

        }

    }

#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN

    else if ( st_ivas->renderer_type == RENDERER_DISABLE || st_ivas->renderer_type == RENDERER_MONO_DOWNMIX || st_ivas->renderer_type == RENDERER_OMASA_MIX_EXT )

    {

        /* close all unnecessary parametric decoding and rendering */

        ivas_dirac_dec_close_binaural_data( st_ivas->hDiracDecBin );

        ivas_dirac_rend_close( &( st_ivas->hDirACRend ) );

        ivas_spat_hSpatParamRendCom_close( &( st_ivas->hSpatParamRendCom ) );

        ivas_dirac_dec_close( &( st_ivas->hDirAC ) );

    }

#else

    else if ( st_ivas->renderer_type == RENDERER_DISABLE || st_ivas->renderer_type == RENDERER_MONO_DOWNMIX )

    {

        if ( st_ivas->hDirAC != NULL )
@@ -1354,6 +1369,7 @@ ivas_error ivas_masa_dec_reconfigure( 
            ivas_dirac_dec_close( &( st_ivas->hDirAC ) );

        }

    }

#endif

    /* possible reconfigure is done later */



    /*-----------------------------------------------------------------*