Commit 7e0dcead authored by vaclav's avatar vaclav
Browse files

editorial improvements

parent cb29ea23

lib_com/ivas_prot.h

+2 −2
Original line number Diff line number Diff line
@@ -3878,7 +3878,7 @@ ivas_error ivas_spar_md_enc_open( 
    const ENCODER_CONFIG_HANDLE hEncoderConfig                  /* i  : configuration structure                 */

#ifdef SBA_ORDER_BITSTREAM

    ,

    int16_t sba_order

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

#endif

);
@@ -3894,7 +3894,7 @@ ivas_error ivas_spar_md_enc_process( 
    const int16_t dtx_silence_mode

#ifdef SBA_ORDER_BITSTREAM

    ,

    int16_t sba_order

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

#endif

);

lib_dec/ivas_dirac_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ ivas_error ivas_dirac_dec_config( 
        st_ivas->nchan_transport = ivas_sba_get_nchan_metadata( st_ivas->sba_order );

#endif

    }



    nchan_transport = st_ivas->nchan_transport;

    if ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE && ivas_total_brate > IVAS_SID_4k4 )

    {

lib_dec/ivas_init_dec.c

+7 −8
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ ivas_error ivas_dec_setup( 
            st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read];



#ifdef SBA_ORDER_BITSTREAM

            /* set Ambisonic (SBA) order used for analysis and coding */

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

#endif
@@ -416,6 +417,7 @@ static ivas_error ivas_read_format( 
        int16_t tc_mode_offset;

        tc_mode_offset = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 );

        idx = st_ivas->bit_stream[tc_mode_offset];



        // TBD: needs more work for HOA

#ifndef SBA_ORDER_BITSTREAM

        if ( st_ivas->sba_order == 0 )
@@ -428,6 +430,7 @@ static ivas_error ivas_read_format( 
            st_ivas->sba_analysis_order = 1;

        }

#endif



        if ( idx == 0 )

        {

            st_ivas->sid_format = SID_SBA_1TC;
@@ -868,6 +871,7 @@ ivas_error ivas_init_decoder( 
                        return error;

                    }

                }



#ifndef SBA_ORDER_BITSTREAM

                if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_order, st_ivas->sba_planar,

                                                      st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK )
@@ -878,6 +882,7 @@ ivas_error ivas_init_decoder( 
                {

                    return error;

                }



                if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA )

                {

                    if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK )
@@ -896,14 +901,8 @@ ivas_error ivas_init_decoder( 


                    st_ivas->hSpar->enc_param_start_band = min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );



                    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 );

                    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 );

                }

            }

            else

lib_dec/ivas_sba_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -526,12 +526,14 @@ ivas_error ivas_sba_dec_reconfigure( 
    else

    {

        int16_t sba_order_internal;



#ifndef SBA_ORDER_BITSTREAM

        sba_order_internal = min( st_ivas->sba_order, IVAS_MAX_SBA_ORDER );

#else

        sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER );

#endif

        ivas_spar_config( st_ivas->hDecoderConfig->ivas_total_brate, sba_order_internal, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, st_ivas->sid_format );



#ifndef SBA_ORDER_BITSTREAM

        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->sba_order, st_ivas->sba_planar,

                                              st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK )

lib_dec/ivas_sba_rendering.c

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ void ivas_sba_upmixer_renderer( 
    int16_t nchan_internal;



    wmops_sub_start( "ivas_sba_upmixer_renderer" );



#ifndef SBA_ORDER_BITSTREAM

    nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_order );

#else