Commit 71161f8c authored by Rivukanta Bhattacharya's avatar Rivukanta Bhattacharya
Browse files

Addressing review comments: set 2

parent c71dde49

lib_com/ivas_dirac_com.c

+8 −0
Original line number Diff line number Diff line
@@ -135,7 +135,11 @@ ivas_error ivas_dirac_config( 
        {

            hFbMdft = NULL;

        }

#ifndef SBA_MODE_CLEAN_UP

        dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hDirAC->dirac_to_spar_md_bands;

#else

        dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;

#endif

    }

    else

    {
@@ -166,7 +170,11 @@ ivas_error ivas_dirac_config( 
            hFbMdft = NULL;

        }

        ( (Decoder_Struct *) st_ivas )->hDirAC->hFbMdft = hFbMdft;

#ifndef SBA_MODE_CLEAN_UP

        dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hDirAC->dirac_to_spar_md_bands;

#else

        dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;

#endif

    }



#ifndef SBA_MODE_CLEAN_UP

lib_dec/ivas_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ ivas_error ivas_dec( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

#endif

        {

#ifndef SBA_MODE_CLEAN_UP

            if ( st_ivas->hQMetaData != NULL )

            {

                st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];
@@ -359,6 +360,7 @@ ivas_error ivas_dec( 
                                        st_ivas->hSpar->dirac_to_spar_md_bands );

#endif

            }

#endif



            if ( ( error = ivas_spar_dec( st_ivas, nb_bits_metadata ) ) != IVAS_ERR_OK )

            {

lib_dec/ivas_init_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -690,7 +690,11 @@ ivas_error ivas_init_decoder( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure        */

)

{

#ifndef SBA_MODE_CLEAN_UP

    int16_t i, k, n;

#else

    int16_t i, n;

#endif

    int16_t sce_id, cpe_id;

    int16_t numCldfbAnalyses, numCldfbSyntheses;

#ifdef JBM_TSM_ON_TCS
@@ -982,10 +986,12 @@ ivas_error ivas_init_decoder( 
                        return error;

                    }



#ifndef SBA_MODE_CLEAN_UP

                    for ( k = 0; k < DIRAC_MAX_NBANDS; k++ )

                    {

                        st_ivas->hSpar->dirac_to_spar_md_bands[k] = st_ivas->hDirAC->dirac_to_spar_md_bands[k];

                    }

#endif

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

                }

                else

lib_dec/ivas_jbm_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ ivas_error ivas_jbm_dec_tc( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

#endif

        {

#ifndef SBA_MODE_CLEAN_UP

            if ( st_ivas->hQMetaData != NULL )

            {

                st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];
@@ -223,6 +224,7 @@ ivas_error ivas_jbm_dec_tc( 
                ivas_dirac_dec_read_BS( ivas_total_brate, st, st_ivas->hDirAC, st_ivas->hQMetaData, &nb_bits_metadata[0], hodirac_flag, st_ivas->hSpar->dirac_to_spar_md_bands );

#endif

            }

#endif



            if ( ( error = ivas_spar_dec( st_ivas, nb_bits_metadata ) ) != IVAS_ERR_OK )

            {

lib_dec/ivas_sba_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -327,7 +327,9 @@ ivas_error ivas_sba_dec_reconfigure( 


    if ( st_ivas->hDirAC != NULL )

    {

#ifndef SBA_MODE_CLEAN_UP

        mvs2s( st_ivas->hDirAC->dirac_to_spar_md_bands, st_ivas->hSpar->dirac_to_spar_md_bands, DIRAC_MAX_NBANDS );

#endif

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

    }