Commit 042791c6 authored by emerit's avatar emerit
Browse files

Merge branch '1206_ref_step_3_fix_inv_diffuse_weight' into 'float-pc' 

Port float MR1206 to float-pc

See merge request !1581
parents fad62286 ecd5318f

apps/decoder.c

+24 −0
Original line number Diff line number Diff line
@@ -812,6 +812,18 @@ int main( 
#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

#ifdef FIX_OLD_BINARY_FORMAT

            cleanup_SetOfHRTF( hSetOfHRTF );

            hrtfFileReader_close( &hrtfReader );

            strcat( arg.hrtfFileName, "new" );



            if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

            }

            if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

                    fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
@@ -822,6 +834,18 @@ int main( 
                    destroy_SetOfHRTF( hSetOfHRTF );

                }

            }

#else

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

            }

            else

            {

                destroy_SetOfHRTF( hSetOfHRTF );

            }

#endif

        }

#else

        if ( ( error = create_SetOfHRTF_from_binary( hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

apps/renderer.c

+23 −0
Original line number Diff line number Diff line
@@ -997,6 +997,28 @@ int main( 


            if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )

            {

#ifdef FIX_OLD_BINARY_FORMAT

                cleanup_SetOfHRTF( hSetOfHRTF );

                hrtfFileReader_close( &hrtfFileReader );

                strcat( args.customHrtfFilePath, "new" );

                if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );

                    goto cleanup;

                }

                if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )

                {

                    if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                    {

                        fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );

                        goto cleanup;

                    }

                    else

                    {

                        destroy_SetOfHRTF( hSetOfHRTF );

                    }

                }

#else

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

                    fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
@@ -1006,6 +1028,7 @@ int main( 
                {

                    destroy_SetOfHRTF( hSetOfHRTF );

                }

#endif

            }



            if ( ( error = IVAS_REND_GetHrtfFastConvHandle( hIvasRend, &hHrtfFastConv ) ) != IVAS_ERR_OK )

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ 
#endif

#define FIX_OLD_BINARY_FORMAT                           /* Orange: trick to make tests succesful when changing hrtf binary format between ref and new branch*/      

#define FIX_OLD_BINARY_FILE                             /* Orange: current hrtf binary file in ref branch contains wrong values for fastconv value. This switch can be activated to compre running codec with and without hrtf file*/      

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */

#endif

#define FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                       /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/

lib_rend/ivas_crend.c

+269 −12

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_dirac_dec_binaural_functions.c

+3 −0
Original line number Diff line number Diff line
@@ -444,6 +444,9 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs( 
        mvr2r( parametricReverberationEneCorrections, hrtfParambin->parametricReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX );

        mvr2r( parametricEarlyPartEneCorrection, hrtfParambin->parametricEarlyPartEneCorrection, CLDFB_NO_CHANNELS_MAX );



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        hrtfParambin->allocatedFromFile = 0;

#endif

        *hHrtfParambin = hrtfParambin;

    }