Commit eb6299a6 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

formatting changes as per review comments

parent a957eb2d

lib_com/ivas_dirac_com.c

+2 −1
Original line number Diff line number Diff line
@@ -219,10 +219,11 @@ ivas_error ivas_dirac_config( 




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

 * ivas_dirac_sba_config_bands()

 * ivas_dirac_config_bands()

 *

 * DirAC Configuration freq. band function; used also in MASA decoder

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



#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

void ivas_dirac_config_bands(

    int16_t *band_grouping, /* o  : band grouping                          */

lib_com/ivas_prot.h

+2 −2
Original line number Diff line number Diff line
@@ -3671,7 +3671,7 @@ void ivas_dirac_config_bands( 
    int16_t *dirac_to_spar_md_bands,                            /* o  : mapping of DirAC parameter band index to SPAR FB band index */

    const int8_t useLowerBandRes,                               /* i  : flag indicating lower band resolution for DirAC             */

    const int16_t enc_param_start_band,                         /* i  : band index of first DirAC parameter band                    */

    IVAS_FB_MIXER_HANDLE hFbMdft,

    IVAS_FB_MIXER_HANDLE hFbMdft,                               /* i  : MDFT filterbank handle                                      */ 

    const int8_t BandGroupLowRes                                /* i  : flag indicating lower band grouping resolution for DirAC    */

);

#else

lib_dec/ivas_dirac_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -1327,6 +1327,7 @@ void ivas_qmetadata_to_dirac( 
            {

                hDirAC->hConfig->nbands = q_direction->cfg.nbands;

            }



#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

            ivas_dirac_config_bands( hDirAC->band_grouping, hDirAC->hConfig->nbands, nbands, dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hDirAC->hConfig->enc_param_start_band, hDirAC->hFbMdft, 0 );

#else

lib_dec/ivas_init_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -1587,6 +1587,7 @@ ivas_error ivas_init_decoder( 
                set_c( (int8_t *) st_ivas->hQMetaData->twoDirBands, (int8_t) 1, st_ivas->hQMetaData->q_direction[0].cfg.nbands );

                st_ivas->hQMetaData->numTwoDirBands = (uint8_t) st_ivas->hQMetaData->q_direction[0].cfg.nbands;

            }



#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

            ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),

                                     st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0, 1 );

lib_dec/ivas_sba_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ ivas_error ivas_sba_dec_reconfigure( 
            set_c( (int8_t *) st_ivas->hQMetaData->twoDirBands, (int8_t) 1, st_ivas->hQMetaData->q_direction[0].cfg.nbands );

            st_ivas->hQMetaData->numTwoDirBands = (uint8_t) st_ivas->hQMetaData->q_direction[0].cfg.nbands;

        }



#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

        ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),

                                 st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0, 1 );
@@ -445,6 +446,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),

                                 st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );

#endif



        if ( st_ivas->hDirAC )

        {

            st_ivas->hDirAC->hConfig->enc_param_start_band = st_ivas->hSpar->enc_param_start_band;