Commit 7dcca215 authored by multrus's avatar multrus
Browse files

[cleanup] accept SBA_ORDER_BITSTREAM

parent affead7d

lib_com/bitstream.c

+0 −6
Original line number Diff line number Diff line
@@ -1981,15 +1981,9 @@ ivas_error preview_indices( 
            st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );

            st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );



#ifdef SBA_ORDER_BITSTREAM

            st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order );

#endif



#ifdef SBA_ORDER_BITSTREAM

            ivas_sba_config( total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );

#else

            ivas_sba_config( total_brate, st_ivas->sba_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );

#endif

        }

    }

lib_com/ivas_dirac_com.c

+0 −8
Original line number Diff line number Diff line
@@ -82,11 +82,7 @@ ivas_error ivas_dirac_config( 
        nCPE = &( (Encoder_Struct *) st_ivas )->nCPE;

        element_mode = &( (Encoder_Struct *) st_ivas )->hEncoderConfig->element_mode_init;

        nchan_transport = &( (Encoder_Struct *) st_ivas )->nchan_transport;

#ifndef SBA_ORDER_BITSTREAM

        sba_order = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->sba_order;

#else

        sba_order = ( (Encoder_Struct *) st_ivas )->sba_analysis_order;

#endif

        sba_planar = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->sba_planar;

        ivas_total_brate = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->ivas_total_brate;

        Fs = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->input_Fs;
@@ -111,11 +107,7 @@ ivas_error ivas_dirac_config( 
        nCPE = &( (Decoder_Struct *) st_ivas )->nCPE;

        element_mode = &( (Decoder_Struct *) st_ivas )->element_mode_init;

        nchan_transport = &( (Decoder_Struct *) st_ivas )->nchan_transport;

#ifndef SBA_ORDER_BITSTREAM

        sba_order = ( (Decoder_Struct *) st_ivas )->sba_order;

#else

        sba_order = ( (Decoder_Struct *) st_ivas )->sba_analysis_order;

#endif

        sba_planar = ( (Decoder_Struct *) st_ivas )->sba_planar;

        ivas_total_brate = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->ivas_total_brate;

        Fs = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->output_Fs;

lib_com/ivas_prot.h

+0 −6
Original line number Diff line number Diff line
@@ -3039,13 +3039,11 @@ int16_t ivas_sba_get_order( 
    const int16_t sba_planar                                    /* i  : SBA planar flag                         */

);



#ifdef SBA_ORDER_BITSTREAM

/*! r: Ambisonic (SBA) order used for analysis and coding */

int16_t ivas_sba_get_analysis_order(

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

    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

);

#endif



int16_t ivas_sba_get_order_transport(

    const int16_t nchan_transport                               /* i  : Number of transport channels            */
@@ -3868,10 +3866,8 @@ void ivas_spar_dec_upmixer( 
ivas_error ivas_spar_md_enc_open(

    ivas_spar_md_enc_state_t **hMdEnc,                          /* i/o: SPAR MD encoder handle                  */

    const ENCODER_CONFIG_HANDLE hEncoderConfig                  /* i  : configuration structure                 */

#ifdef SBA_ORDER_BITSTREAM

    ,

    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

#endif

);



void ivas_spar_md_enc_close(
@@ -3884,10 +3880,8 @@ ivas_error ivas_spar_md_enc_process( 
    ivas_spar_md_enc_in_buf_t *pIn_buf,

    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: MetaData handle                         */

    const int16_t dtx_silence_mode

#ifdef SBA_ORDER_BITSTREAM

    ,

    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

#endif

);



void ivas_compute_spar_params(

lib_com/ivas_sba_config.c

+0 −2
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ int16_t ivas_sba_get_order( 
}





#ifdef SBA_ORDER_BITSTREAM

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

 * ivas_sba_get_analysis_order()

 *
@@ -208,7 +207,6 @@ int16_t ivas_sba_get_analysis_order( 


    return sba_analysis_order;

}

#endif





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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
#define FIX_ADAP_STEFI_SHIFT                            /* Issue 89: fix bug in parameter shift of adaptive stereo filling */





#define SBA_ORDER_BITSTREAM                             /* issue 76: Use input sba order for bitstream coding */



/* NTT switches */

#define NTT_UPDATE_ITD_SW                               /* contribution 4: Update of ITD switch in stereo downmix for EVS */