Commit 16e9f597 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'origin/ivas-float-update' into... 

Merge remote-tracking branch 'origin/ivas-float-update' into 1894-port-osba-fixes-basop-298-355-360_port-to-float-update
parents 5b296a79 b4e5ec84

lib_com/ivas_prot.h

+8 −2
Original line number Diff line number Diff line
@@ -84,7 +84,13 @@ void ivas_write_format( 
void ivas_write_format_sid(

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */

    const int16_t element_mode,                                 /* i  : element bitrate                         */

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

    BSTR_ENC_HANDLE hBstr,                                      /* i/o: encoder bitstream handle                */

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

    const int16_t sba_planar                                    /* i  : SBA planar flag                         */

#else

    BSTR_ENC_HANDLE hBstr                                       /* i/o: encoder bitstream handle                */

#endif

);



ivas_error create_sce_enc(
@@ -3529,7 +3535,7 @@ int16_t ivas_sba_get_nchan_metadata( 
);



#ifdef NONBE_FIX_1052_SBA_EXT

/*! r: number of bits in SPAR SID frame */

/*! r: number of bits in SBA SID frame */

int16_t ivas_sba_spar_sid_bitlen(

    const int16_t nchan_transport                               /* i  : number of transport channels            */

);

lib_com/ivas_sba_config.c

+2 −2
Original line number Diff line number Diff line
@@ -163,10 +163,10 @@ int16_t ivas_sba_get_nchan( 
/*-------------------------------------------------------------------*

 * ivas_sba_spar_sid_bitlen()

 *

 * Get number of bits in SPAR SID frame

 * Get number of bits in SBA SID frame

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



/*! r: number of bits in SPAR SID frame */

/*! r: number of bits in SBA SID frame */

int16_t ivas_sba_spar_sid_bitlen(

    const int16_t nchan_transport /* i  : number of transport channels            */

)

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ 
#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */



#define FIX_1849_OBJ_EDITING_API

#define NONBE_FIX_1262_OSBA_STEREO

lib_dec/ivas_dirac_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1065,12 +1065,12 @@ void ivas_dirac_dec_read_BS( 
        next_bit_pos_orig = st->next_bit_pos;



        /* subtract mode signaling bits, since bitstream was moved after mode reading */



#ifdef NONBE_FIX_1052_SBA_EXT

        st->next_bit_pos = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 - SID_FORMAT_NBITS - SBA_PLANAR_BITS - SBA_ORDER_BITS );

#else

        st->next_bit_pos = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 - SID_FORMAT_NBITS );

#endif



        /* 1 bit flag for signaling metadata to read */

        b = st->bit_stream[( st->next_bit_pos )--];

        ( *nb_bits )++;

lib_dec/ivas_init_dec.c

+19 −3
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ ivas_error ivas_dec_setup( 
            st_ivas->sba_order = st_ivas->bit_stream[num_bits_read + 1];

            st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read];



#ifndef NONBE_FIX_1052_SBA_EXT_FIX

#ifdef NONBE_FIX_1052_SBA_EXT

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

            {
@@ -379,7 +380,7 @@ ivas_error ivas_dec_setup( 
                st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );

            }

#endif



#endif

            num_bits_read += SBA_ORDER_BITS;

            if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->last_active_ivas_total_brate && ivas_total_brate > IVAS_SID_5k2 )

            {
@@ -639,7 +640,7 @@ ivas_error ivas_dec_setup( 
                break;

        }





#ifndef NONBE_FIX_1052_SBA_EXT_FIX

#ifdef NONBE_FIX_1052_SBA_EXT

        if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

        {
@@ -651,7 +652,7 @@ ivas_error ivas_dec_setup( 
            st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );

        }

#endif



#endif

        if ( st_ivas->ini_frame > 0 && st_ivas->ivas_format == SBA_FORMAT )

        {

            int16_t nchan_transport_old, nchan_transport;
@@ -1035,6 +1036,9 @@ ivas_error ivas_init_decoder_front( 


    st_ivas->nSCE = 0;

    st_ivas->nCPE = 0;

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

    st_ivas->nchan_ism = 0;

#endif

    st_ivas->nchan_transport = -1;



    st_ivas->ism_mode = ISM_MODE_NONE;
@@ -1205,7 +1209,11 @@ ivas_error ivas_init_decoder( 
        {

            hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->transport_config );

        }

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == SBA_FORMAT )

#else

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

#else

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif
@@ -1246,7 +1254,11 @@ ivas_error ivas_init_decoder( 
        st_ivas->intern_config = st_ivas->transport_config;

    }

#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

    else if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && ( st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == SBA_FORMAT ) )

#else

    else if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

    {

        st_ivas->intern_config = ivas_set_audio_config_from_sba_order( st_ivas->sba_order );

        ivas_output_init( &( st_ivas->hOutSetup ), st_ivas->intern_config );
@@ -1476,7 +1488,11 @@ ivas_error ivas_init_decoder( 
            return error;

        }



#ifdef NONBE_FIX_1052_SBA_EXT_FIX

        if ( hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_FOA && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_MONO && !( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA ) )

#else

        if ( hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_FOA && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_MONO )

#endif

        {

            if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_OPEN ) ) != IVAS_ERR_OK )

            {