Commit d99829cc authored by vaclav's avatar vaclav
Browse files

remove "TD Renderer result code." description as it is actually ivas_error;... 

remove "TD Renderer result code." description as it is actually ivas_error; simplify returns for TD renderer functions
parent 0c6d10b0

lib_com/ivas_prot.h

+5 −20
Original line number Diff line number Diff line
@@ -4871,8 +4871,7 @@ void ivas_HRTF_binary_close( 
    TDREND_HRFILT_FiltSet_t **hHrtfTD                           /* i/o: TD renderer HRTF handle                 */

);



/*! r: TD Renderer result code. */

ivas_error DefaultBSplineModel(

void DefaultBSplineModel(

    TDREND_HRFILT_FiltSet_t *HrFiltSet_p,                       /* o  : Loaded HR filter set                    */

    const int32_t output_Fs                                     /* i  : Output sampling rate                    */

);
@@ -4885,7 +4884,7 @@ void ivas_td_binaural_close( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd          /* i/o: TD binaural object renderer handle      */

);



ivas_error ObjRenderIVASFrame(

void ObjRenderIVASFrame(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */

    float output[][L_FRAME48k],                                 /* i/o: SCE channels / Binaural synthesis       */

    const int16_t output_frame                                  /* i  : output frame length                     */
@@ -4937,35 +4936,30 @@ ivas_error TDREND_REND_RenderSourceHRFilt( 


/* ----- Object renderer - sources ----- */

 

/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_SRC_SetPos(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    const int16_t SrcInd,                                       /* i  : Source index                            */

    const float *Vec_p                                          /* i  : Position vector                         */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_SRC_SetDir(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    const int16_t SrcInd,                                       /* i  : Source index                            */

    const float *Vec_p                                          /* i  : Direction vector                        */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_SRC_SetDirAtten(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    const int16_t SrcInd,                                       /* i  : Source index                            */

    const TDREND_DirAtten_t *DirAtten_p                         /* i  : Directional attenuation specifier       */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_SRC_SetPlayState(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    const int16_t SrcInd,                                       /* i  : Source index                            */

    const TDREND_PlayStatus_t PlayStatus                        /* i  : Play state                              */

);





void TDREND_SRC_REND_UpdateFiltersFromSpatialParams(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    TDREND_SRC_REND_t *SrcRend_p,                               /* i/o: Source object                           */
@@ -4973,7 +4967,6 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 
    const int32_t output_Fs                                     /* i  : Output sample rate                      */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_SRC_Alloc(

    TDREND_SRC_t **Src_pp                                       /* i/o: Source                                  */

);
@@ -5027,7 +5020,6 @@ int16_t TDREND_SPATIAL_EvalOrthonormOrient( 


/* ----- Object renderer - mix ----- */



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_AddSrc(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    int16_t *SrcInd,                                            /* o  : Source index                            */
@@ -5035,19 +5027,16 @@ ivas_error TDREND_MIX_AddSrc( 
    const int32_t output_Fs                                     /* i  : Output sampling rate                    */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_SetDistAttenModel(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    const TDREND_DistAttenModel_t DistAttenModel                /* i  : Distance attenuation model              */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_LIST_SetPos(

void TDREND_MIX_LIST_SetPos(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    const float *Pos_p                                          /* i  : Listener's position                     */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_LIST_SetOrient(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    const float *FrontVec_p,                                    /* i  : Listener's orientation front vector     */
@@ -5058,7 +5047,6 @@ void TDREND_MIX_Dealloc( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd           /* i/o: TD renderer handle                      */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_Init(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

    TDREND_HRFILT_FiltSet_t **hHrtfTD,                          /* i/o: HRTF data (initialized in case of NULL) */
@@ -5068,21 +5056,18 @@ ivas_error TDREND_MIX_Init( 


 /* ----- Object renderer - sfx ----- */



/*! r: TD Renderer result code. */

ivas_error TDREND_SFX_SpatBin_Initialize(

    SFX_SpatBin_t *SfxSpatBin_p,                                /* i/o: Spatial parameters handle               */

    const int32_t output_Fs                                     /* i  : Output sampling rate                    */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_SFX_SpatBin_SetParams(

void TDREND_SFX_SpatBin_SetParams(

    SFX_SpatBin_t *SfxSpatBin_p,                                /* i/o: Spatial parameters struct to be updated */

    const SFX_SpatBin_Params_t *NewParam_p,                     /* i  : New parameters struct                   */

    const int32_t output_Fs                                     /* i  : Output sample rate                      */

);



/*! r: TD Renderer result code. */

ivas_error TDREND_SFX_SpatBin_Execute_Main(

void TDREND_SFX_SpatBin_Execute_Main(

    SFX_SpatBin_t *SfxSpatBin_p,                                /* i/o: Spatial parameters handle                  */

    const float *InBuffer_p,                                    /* i  : Input buffer                               */

    const int16_t output_frame,                                 /* i  : frame length                               */

lib_dec/ivas_hrtf.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ void BSplineModelEvalAlloc( 
 * Init default HRTF model

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



ivas_error DefaultBSplineModel(

void DefaultBSplineModel(

    TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* o  : Loaded HR filter set      */

    const int32_t output_Fs               /* i  : Output sampling rate      */

)
@@ -216,7 +216,7 @@ ivas_error DefaultBSplineModel( 
    HrFiltSet_p->FiltLength = HrFiltSet_p->ModelParams.K;

    BSplineModelEvalAlloc( &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval );



    return IVAS_ERR_OK;

    return;

}

lib_dec/ivas_objectRenderer.c

+12 −10
Original line number Diff line number Diff line
@@ -45,16 +45,17 @@ 
/*---------------------------------------------------------------------*

 * Local function prototypes

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



static ivas_error TDREND_GetMix( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, float output[][L_FRAME48k], const int16_t output_frame, const int32_t output_Fs );

static void TDREND_Clear_Update_flags( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd );





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

 * ivas_td_binaural_open()

 *

 * Open and initialize TD Object binaural renderer

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



/*! r: TD Renderer result code. */

ivas_error ivas_td_binaural_open(

    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure  */

)
@@ -213,8 +214,7 @@ void ivas_td_binaural_close( 
 * and renders the current frame.

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



/*! r: TD Renderer result code. */

ivas_error ObjRenderIVASFrame(

void ObjRenderIVASFrame(

    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder structure            */

    float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */

    const int16_t output_frame  /* i  : output frame length               */
@@ -328,7 +328,8 @@ ivas_error ObjRenderIVASFrame( 
            v_add( reverb_signal[1], output[1], output[1], output_frame );

        }

    }

    return IVAS_ERR_OK;



    return;

}
@@ -338,7 +339,6 @@ ivas_error ObjRenderIVASFrame( 
 * Render one output frame from the mixer

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



/*! r: TD Renderer result code. */

static ivas_error TDREND_GetMix(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */

    float output[][L_FRAME48k],                        /* i/o: ISm object synth / rendered output in 0,1 */
@@ -350,10 +350,10 @@ static ivas_error TDREND_GetMix( 
    TDREND_SRC_t *Src_p;

    TDREND_SRC_SPATIAL_t *SrcSpatial_p;

    TDREND_SRC_REND_t *SrcRend_p;

    ivas_error result;

    ivas_error error;

    float output_buf[2][L_FRAME48k]; /* Temp buffer for left/right rendered signal */



    result = IVAS_ERR_OK;

    error = IVAS_ERR_OK;



    /* Zero out the output buffer since objects are accumulated.  */

    set_f( output_buf[0], 0.0f, output_frame );
@@ -377,9 +377,9 @@ static ivas_error TDREND_GetMix( 
        if ( ( SrcRend_p->InputAvailable == TRUE ) && ( SrcRend_p->PlayStatus == TDREND_PLAYSTATUS_PLAYING ) )

        {

#ifdef TDREND_HRTF_TABLE_METHODS

            result = TDREND_REND_RenderSourceHRFilt( Src_p, hBinRendererTd, output_buf, output_frame, output_Fs );

            error = TDREND_REND_RenderSourceHRFilt( Src_p, hBinRendererTd, output_buf, output_frame, output_Fs );

#else

            result = TDREND_REND_RenderSourceHRFilt( Src_p, output_buf, output_frame, output_Fs );

            error = TDREND_REND_RenderSourceHRFilt( Src_p, output_buf, output_frame, output_Fs );

#endif

        }

        SrcRend_p->InputAvailable = FALSE;
@@ -392,7 +392,7 @@ static ivas_error TDREND_GetMix( 
    /* Clear the mixer update flags */

    TDREND_Clear_Update_flags( hBinRendererTd );



    return result;

    return error;

}
@@ -409,9 +409,11 @@ static void TDREND_Clear_Update_flags( 
    int16_t i;



    hBinRendererTd->Listener_p->PoseUpdated = FALSE;



    for ( i = 0; i < hBinRendererTd->NumOfSrcs; i++ )

    {

        hBinRendererTd->Sources[i]->SrcSpatial_p->Updated = FALSE;

    }



    return;

}

lib_dec/ivas_objectRenderer_hrFilt.c

+3 −6
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ ivas_error TDREND_REND_RenderSourceHRFilt( 
    const int32_t output_Fs         /* i  : Output sample rate         */

)

{

    ivas_error SFX_Result;

    TDREND_SRC_REND_t *SrcRend_p;

    int16_t nS;

    float *InFrame_nIC_p;
@@ -370,9 +369,7 @@ ivas_error TDREND_REND_RenderSourceHRFilt( 
    /* SrcGain = Mix_p->Gain * ( *SrcRend_p->SrcGain_p ); */

    /* SrcGain *= ( *SrcRend_p->DirGain_p ) * ( *SrcRend_p->DistGain_p ); */



    SFX_Result = TDREND_SFX_SpatBin_Execute_Main( SrcRend_p->SfxSpatBin_p, InFrame_nIC_p, output_frame,

                                                  LeftOutputFrame, RightOutputFrame,

                                                  &NoOfUsedInputSamples, &NoOfDeliveredOutputSamples, output_Fs );

    TDREND_SFX_SpatBin_Execute_Main( SrcRend_p->SfxSpatBin_p, InFrame_nIC_p, output_frame, LeftOutputFrame, RightOutputFrame, &NoOfUsedInputSamples, &NoOfDeliveredOutputSamples, output_Fs );



#ifdef TDREND_HRTF_TABLE_METHODS

    if ( hBinRendererTd->HrFiltSet_p->FilterMethod != TDREND_HRFILT_Method_BSplineModel )
@@ -392,7 +389,7 @@ ivas_error TDREND_REND_RenderSourceHRFilt( 
        *RightAccOutputFrame_p++ += *RightOutputFrame_p++;

    }



    return SFX_Result;

    return IVAS_ERR_OK;

}

lib_dec/ivas_objectRenderer_mix.c

+2 −7
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ 
 * Sets the listener's position in the specified mixer unit.

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



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_LIST_SetPos(

void TDREND_MIX_LIST_SetPos(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle      */

    const float *Pos_p                                 /* i  : Listener's position     */

)
@@ -65,7 +64,7 @@ ivas_error TDREND_MIX_LIST_SetPos( 
        Listener_p->PoseUpdated = TRUE;

    }



    return IVAS_ERR_OK;

    return;

}
@@ -75,7 +74,6 @@ ivas_error TDREND_MIX_LIST_SetPos( 
 * Sets the listener's orientation vectors in the specified mixer unit.

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



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_LIST_SetOrient(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle                  */

    const float *FrontVec_p,                           /* i  : Listener's orientation front vector */
@@ -193,7 +191,6 @@ void TDREND_MIX_Dealloc( 
 * Initializes the mixer and sets HRTF

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



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_Init(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle                       */

    TDREND_HRFILT_FiltSet_t **hHrtfTD,                 /* i/o: HRTF data (initialized in case of NULL)  */
@@ -256,7 +253,6 @@ ivas_error TDREND_MIX_Init( 
 * Set the distance attenuation model of the mixer

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



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_SetDistAttenModel(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle         */

    const TDREND_DistAttenModel_t DistAttenModel       /* i  : Distance attenuation model */
@@ -291,7 +287,6 @@ ivas_error TDREND_MIX_SetDistAttenModel( 
 * Adds the specified input source unit to the specified mixer unit.

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



/*! r: TD Renderer result code. */

ivas_error TDREND_MIX_AddSrc(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle                */

    int16_t *SrcInd,                                   /* o  : Source index                      */