Commit 88e36897 authored by Jiaquan Huo's avatar Jiaquan Huo
Browse files

Merge branch 'sba-ext' into 'main' 

[non-io][non-be] SBA EXT

See merge request !1539
parents 6ebdfb6f 68271752

lib_com/ivas_prot.h

+18 −2
Original line number Diff line number Diff line
@@ -3207,6 +3207,9 @@ void ivas_qmetadata_enc_sid_encode( 
    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: metadata bitstream handle               */

    IVAS_QMETADATA *q_metadata,                                 /* i/o: metadata handle                         */

    const int16_t masa_sid_descriptor,                          /* i  : description of MASA SID coding structure*/

#ifdef NONBE_FIX_1052_SBA_EXT

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

#endif

	const int16_t ivas_format                                   /* i  : ivas format                             */

);
@@ -3515,6 +3518,13 @@ int16_t ivas_sba_get_nchan_metadata( 
    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                      */

);



#ifdef NONBE_FIX_1052_SBA_EXT

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

int16_t ivas_sba_spar_sid_bitlen(

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

);

#endif



void ivas_sba_get_spar_hoa_ch_ind(

    const int16_t num_md_chs,                                   /* i  : number of MD channels                   */

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
@@ -3616,6 +3626,9 @@ ivas_error ivas_dirac_enc( 
    const int16_t input_frame,                                  /* i  : input frame length                      */

    const int16_t dtx_vad,                                      /* i  : DTX vad flag                            */

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

#ifdef NONBE_FIX_1052_SBA_EXT

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

#endif

	const int16_t hodirac_flag                                  /* i  : hodirac flag                            */

);
@@ -3671,6 +3684,9 @@ void ivas_dirac_dec_read_BS( 
    int16_t *nb_bits,                                           /* o  : number of bits read                     */

    const int16_t last_bit_pos,                                 /* i  : last read bitstream position            */

    const int16_t hodirac_flag,                                 /* i  : flag to indicate HO-DirAC mode          */

	#ifdef NONBE_FIX_1052_SBA_EXT

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

#endif

    int16_t *dirac_to_spar_md_bands                             /* o  : DirAC->SPAR MD bands                    */

);

lib_com/ivas_sba_config.c

+23 −0
Original line number Diff line number Diff line
@@ -158,6 +158,29 @@ int16_t ivas_sba_get_nchan( 
    return ( nb_channels );

}



#ifdef NONBE_FIX_1052_SBA_EXT

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

 * ivas_sba_spar_sid_bitlen()

 *

 * Get number of bits in SPAR SID frame

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



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

int16_t ivas_sba_spar_sid_bitlen(

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

)

{

    int16_t num_bits;



    num_bits = SPAR_DTX_BANDS * SPAR_SID_BITS_TAR_PER_BAND;

    if ( nchan_transport > 1 )

    {

        num_bits -= 2;

    }



    return num_bits;

}

#endif



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

 * ivas_sba_get_nchan_metadata()

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ 
#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 

#define NONBE_FIX_MC_LFE_LPF                            /* Dlb: Adding the LFE LPF filter back for MC content. */

#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_dirac_dec.c

+17 −1
Original line number Diff line number Diff line
@@ -1013,6 +1013,9 @@ void ivas_dirac_dec_read_BS( 
    int16_t *nb_bits,                                     /* o  : number of bits read             */

    const int16_t last_bit_pos,                           /* i  : last read bitstream position    */

    const int16_t hodirac_flag,                           /* i  : flag to indicate HO-DirAC mode  */

#ifdef NONBE_FIX_1052_SBA_EXT

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

#endif

    int16_t *dirac_to_spar_md_bands /* o  : DirAC->SPAR MD bands            */

)

{
@@ -1046,7 +1049,12 @@ void ivas_dirac_dec_read_BS( 
                }

            }



#ifdef NONBE_FIX_1052_SBA_EXT

            *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), nchan_transport, NULL, SBA_FORMAT );

#else

            *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT );

#endif



            for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

            {

                hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth[i] = hQMetaData->q_direction[0].band_data[1].azimuth[0];
@@ -1094,7 +1102,11 @@ 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 )++;
@@ -1114,7 +1126,11 @@ void ivas_dirac_dec_read_BS( 
            }

        }



#ifdef NONBE_FIX_1052_SBA_EXT

        *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), nchan_transport, NULL, SBA_FORMAT );

#else

        *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT );

#endif

        for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

        {

            hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth[i] = hQMetaData->q_direction[0].band_data[1].azimuth[0];

lib_dec/ivas_init_dec.c

+51 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ static ivas_error ivas_read_format( Decoder_Struct *st_ivas, int16_t *num_bits_r 


static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas );



#ifdef NONBE_FIX_1052_SBA_EXT

static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order );

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

static ivas_error ivas_dec_reconfig_split_rend( Decoder_Struct *st_ivas );
@@ -240,6 +244,28 @@ static ivas_error ivas_dec_init_split_rend( 
}

#endif



#ifdef NONBE_FIX_1052_SBA_EXT

static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order )

{

    AUDIO_CONFIG output_config;

    output_config = IVAS_AUDIO_CONFIG_HOA3;

    switch ( sba_order )

    {

        case SBA_FOA_ORDER:

            output_config = IVAS_AUDIO_CONFIG_FOA;

            break;

        case SBA_HOA2_ORDER:

            output_config = IVAS_AUDIO_CONFIG_HOA2;

            break;

        case SBA_HOA3_ORDER:

            output_config = IVAS_AUDIO_CONFIG_HOA3;

            break;

        default:

            assert( 0 );

    }

    return output_config;

}

#endif



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

 * ivas_dec_setup()
@@ -327,6 +353,13 @@ ivas_error ivas_dec_setup( 
            /* read Ambisonic (SBA) order */

            st_ivas->sba_order = st_ivas->bit_stream[num_bits_read + 1];

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

#ifdef NONBE_FIX_1052_SBA_EXT

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

            {

                st_ivas->hDecoderConfig->output_config = ivas_set_output_config_from_sba_order( st_ivas->sba_order );

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

            }

#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 )
@@ -608,6 +641,14 @@ ivas_error ivas_dec_setup( 
                break;

        }



#ifdef NONBE_FIX_1052_SBA_EXT

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

        {

            st_ivas->hDecoderConfig->output_config = ivas_set_output_config_from_sba_order( st_ivas->sba_order );

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

        }

#endif



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

        {

            int16_t nchan_transport_old, nchan_transport;
@@ -884,6 +925,16 @@ static ivas_error ivas_read_format( 


        if ( st_ivas->ivas_format == SBA_FORMAT )

        {

#ifdef NONBE_FIX_1052_SBA_EXT

            /* read Ambisonic (SBA) planar flag */

            st_ivas->sba_planar = st_ivas->bit_stream[*num_bits_read];

            *num_bits_read += SBA_PLANAR_BITS;



            /* read Ambisonic (SBA) order */

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

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

            *num_bits_read += SBA_ORDER_BITS;

#endif

            if ( st_ivas->sba_analysis_order == 0 )

            {

                st_ivas->sba_analysis_order = SBA_FOA_ORDER;