Commit 058b855f authored by vaclav's avatar vaclav
Browse files

formal improvements

parent eac7761d

lib_com/ivas_prot.h

+3 −1
Original line number Diff line number Diff line
@@ -3287,6 +3287,7 @@ void ivas_sba_getTCs( 
    const int16_t input_frame                                   /* i  : frame length                            */

);



/*! r: number of remapped SBA TCs */

int16_t ivas_sba_remapTCs(

    float sba_data[][L_FRAME48k],                               /* i/o: SBA signals                             */

    Decoder_Struct *st_ivas,                                    /* i/o: decoder struct                          */
@@ -3305,8 +3306,9 @@ void ivas_sba_dirac_stereo_config( 
);



#ifdef SBA2MONO

/*! r: SBA DirAC stereo flag */

int16_t ivas_get_sba_dirac_stereo_flag(

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

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

);

#endif

lib_dec/ivas_sba_dirac_stereo_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -52,8 +52,9 @@ 
 * Set sba_dirac_stereo_flag

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



/*! r: SBA DirAC stereo flag */

int16_t ivas_get_sba_dirac_stereo_flag(

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

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

)

{

    int16_t sba_dirac_stereo_flag;

lib_dec/ivas_sba_rendering_internal.c

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ void ivas_mc2sba( 
 * Get TCs from Ambisonics signal in ACN

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



/*! r: number of remapped SBA TCs */

int16_t ivas_sba_remapTCs(

    float sba_data[][L_FRAME48k], /* i/o: SBA signals                  */

    Decoder_Struct *st_ivas,      /* i/o: decoder struct               */

lib_rend/ivas_dirac_dec_binaural_functions.c

+14 −13
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void matrixMul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Ai 
static void matrixTransp2Mul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] );



#ifdef NOKIA_PARAMBIN_REQULARIZATION

static float configure_reqularization_factor( const IVAS_FORMAT ivas_format, const int32_t ivas_brate );

static float configure_reqularization_factor( const IVAS_FORMAT ivas_format, const int32_t ivas_total_brate );

#endif



/*-------------------------------------------------------------------------
@@ -2100,34 +2100,35 @@ static void hrtfShGetHrtf( 
/*! r: Configured reqularization factor value to be set. */

static float configure_reqularization_factor(

    const IVAS_FORMAT ivas_format, /* i  : IVAS codec format in use */

    const int32_t ivas_brate )     /* i: Current IVAS bitrate     */

    const int32_t ivas_total_brate /* i  : IVAS total bitrate     */

)

{

    float reqularizationFactor;

    reqularizationFactor = 1.0f; /* Default value */



    if ( ivas_format == MASA_FORMAT )

    {

        if ( ivas_brate >= IVAS_256k )

        if ( ivas_total_brate >= IVAS_256k )

        {

            reqularizationFactor = 0.2f;

        }

        else if ( ivas_brate == IVAS_192k )

        else if ( ivas_total_brate == IVAS_192k )

        {

            reqularizationFactor = 0.3f;

        }

        else if ( ivas_brate == IVAS_160k )

        else if ( ivas_total_brate == IVAS_160k )

        {

            reqularizationFactor = 0.4f;

        }

        else if ( ivas_brate == IVAS_128k )

        else if ( ivas_total_brate == IVAS_128k )

        {

            reqularizationFactor = 0.5f;

        }

        else if ( ivas_brate == IVAS_96k )

        else if ( ivas_total_brate == IVAS_96k )

        {

            reqularizationFactor = 0.6f;

        }

        else if ( ivas_brate >= IVAS_64k )

        else if ( ivas_total_brate >= IVAS_64k )

        {

            reqularizationFactor = 0.8f;

        }
@@ -2139,19 +2140,19 @@ static float configure_reqularization_factor( 


    if ( ivas_format == MC_FORMAT ) /* This is always McMASA for parametric binauralizer. */

    {

        if ( ivas_brate >= IVAS_96k )

        if ( ivas_total_brate >= IVAS_96k )

        {

            reqularizationFactor = 0.3f;

        }

        else if ( ivas_brate >= IVAS_80k )

        else if ( ivas_total_brate >= IVAS_80k )

        {

            reqularizationFactor = 0.5f;

        }

        else if ( ivas_brate >= IVAS_64k )

        else if ( ivas_total_brate >= IVAS_64k )

        {

            reqularizationFactor = 0.7f;

        }

        else if ( ivas_brate >= IVAS_48k )

        else if ( ivas_total_brate >= IVAS_48k )

        {

            reqularizationFactor = 0.8f;

        }