Commit 74331d14 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1495_INCORRECT_FREAD_CALL

parent eedccddd

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */

#define FIX_1495_INCORRECT_FREAD_CALL                   /* Eri: Switched size and number of elements in fread call. */

#define FIX_1486_INIT_OUTPUT_POINTERS                   /* FhG: always initialize pointers in renderer flush */

#define FIX_1494_SET_SPLITBFI_UNUSED                    /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */

#define FIX_1479_MSAN_SPAR_UNINITIALIZED_VALUE          /* Dolby: Fix for issue 1479, MSAN error due to uninitialized value in SPAR */

lib_util/hrtf_file_reader.c

+0 −60
Original line number Diff line number Diff line
@@ -302,11 +302,7 @@ static ivas_error TDREND_LoadBSplineBinaryITD( 
    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

    fread( v_tmp16, sizeof( Word16 ), modelITD->elevDim3 - 2, f_hrtf );

    for ( j = 0; j < modelITD->elevDim3 - 2; j++ )

    {
@@ -321,11 +317,7 @@ static ivas_error TDREND_LoadBSplineBinaryITD( 
    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

    fread( v_tmp16, sizeof( Word16 ), ( modelITD->azimDim3 + 1 ) / 2 - 2, f_hrtf );

    for ( j = 0; j < ( modelITD->azimDim3 + 1 ) / 2 - 2; j++ )

    {
@@ -340,11 +332,7 @@ static ivas_error TDREND_LoadBSplineBinaryITD( 
        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }



#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

    v_tmp16 = (Word16 *) malloc( tmp * sizeof( Word16 ) );

    if ( v_tmp16 == NULL )

    {
@@ -380,11 +368,7 @@ static ivas_error TDREND_LoadBSplineBinaryITD( 
    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

    fread( v_tmp16, sizeof( Word16 ), tmp, f_hrtf );

    for ( j = 0; j < tmp; j++ )

    {
@@ -420,11 +404,7 @@ static ivas_error TDREND_LoadBSplineBinaryITD( 
    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

    fread( v_tmp16, sizeof( Word16 ), tmp, f_hrtf );

    for ( j = 0; j < tmp; j++ )

    {
@@ -469,17 +449,9 @@ static ivas_error TDREND_LoadBSplineBinary( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

    HrFiltSet_p->latency_s_Q_fx = Q31 - factor_Q;

#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &HrFiltSet_p->latency_s_fx, sizeof( Word32 ), 1, f_hrtf );

#else

    fread( &HrFiltSet_p->latency_s_fx, 1, sizeof( Word32 ), f_hrtf );

#endif

    model = &( HrFiltSet_p->ModelParams );



    /* Set ROM flag for correct deallocation */
@@ -524,11 +496,7 @@ static ivas_error TDREND_LoadBSplineBinary( 
    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

    fread( v_tmp16, sizeof( Word16 ), model->elevDim3 - 2, f_hrtf );

    for ( j = 0; j < model->elevDim3 - 2; j++ )

    {
@@ -554,11 +522,7 @@ static ivas_error TDREND_LoadBSplineBinary( 
        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

        }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

        fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

        fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

        fread( v_tmp16, sizeof( Word16 ), ( model->azimDim3_dyn[i] + 1 ), f_hrtf );

        for ( j = 0; j < model->azimDim3_dyn[i] + 1; j++ )

        {
@@ -574,11 +538,7 @@ static ivas_error TDREND_LoadBSplineBinary( 
    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif



    model->AlphaL_e = Q15 - factor_Q;

    //    model->AlphaL_dyn_e = 1; /* force to 6 to be corrected  */
@@ -621,11 +581,7 @@ static ivas_error TDREND_LoadBSplineBinary( 
        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

        }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

        fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

        fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

        v_tmp16 = (Word16 *) malloc( tmp * sizeof( Word16 ) );

        if ( v_tmp16 == NULL )

        {
@@ -675,11 +631,7 @@ static ivas_error TDREND_LoadBSplineBinary( 
        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }



#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif

    fread( v_tmp16, sizeof( Word16 ), tmp, f_hrtf );

    for ( j = 0; j < tmp; j++ )

    {
@@ -694,11 +646,7 @@ static ivas_error TDREND_LoadBSplineBinary( 
    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );

    }

#ifdef FIX_1495_INCORRECT_FREAD_CALL

    fread( &factor_Q, sizeof( Word16 ), 1, f_hrtf );

#else

    fread( &factor_Q, 1, sizeof( Word16 ), f_hrtf );

#endif



    model->EL_e = Q31 - factor_Q;

    model->ER_e = model->EL_e;
@@ -943,11 +891,7 @@ static ivas_error TDREND_MIX_LoadHRTF( 


        /* try if it is old format for BE tests*/

        fseek( f_hrtf, 0, SEEK_SET );

#ifdef FIX_1495_INCORRECT_FREAD_CALL

        if ( fread( &tmp, sizeof( Word16 ), 1, f_hrtf ) == 0 )

#else

        if ( fread( &tmp, 1, sizeof( Word16 ), f_hrtf ) == 0 )

#endif

        {

            header_check_result = IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" );

        }
@@ -1019,11 +963,7 @@ static ivas_error TDREND_MIX_LoadHRTF( 


    if ( is_tdrend )

    {

#ifdef FIX_1495_INCORRECT_FREAD_CALL

        if ( fread( &tmp, sizeof( Word16 ), 1, f_hrtf ) == 0 )

#else

        if ( fread( &tmp, 1, sizeof( Word16 ), f_hrtf ) == 0 )

#endif

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" );

        }