Commit ba1338a5 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

SPAR HOA2 + pHOA3 + HO DIRAC at 512 kbps

parent eb5a9dd3

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -673,7 +673,11 @@ int main( 
    }



    /* === Configure === */

#ifdef FIX_392_LATE_REVERB

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) || ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "Error in Renderer Config Init\n" );

        exit( -1 );

lib_com/ivas_cnst.h

+6 −0
Original line number Diff line number Diff line
@@ -990,7 +990,13 @@ typedef enum 


#define SPAR_CONFIG_BW                          FB



#ifndef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

#define IVAS_SPAR_MAX_CH                        (FOA_CHANNELS + 2 * ( IVAS_MAX_SBA_ORDER - 1 )) /* FOA + planar HOA */

#else

#define IVAS_SPAR_MAX_CH                        ((( IVAS_MAX_SBA_ORDER ) * ( IVAS_MAX_SBA_ORDER )) + 2) /* HOA2 + pHOA3*/

#define IVAS_HBR_MAX_DECOR_CHS                  (2)

#endif



#ifdef HODIRAC

#define IVAS_SPAR_MAX_FB_IN_CHAN               11

#endif

lib_com/ivas_fb_mixer.c

+9 −1
Original line number Diff line number Diff line
@@ -526,6 +526,10 @@ void ivas_fb_mixer_pcm_ingest( 
    float pcm_in[][L_FRAME48k],    /* i  : input audio channels        */

    float **ppOut_pcm,             /* o  : output audio channels       */

    const int16_t frame_len        /* i  : frame length                */

#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

    ,

    const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH]

#endif

)

{

    int16_t i;
@@ -545,7 +549,11 @@ void ivas_fb_mixer_pcm_ingest( 
    {

        mvr2r( &hFbMixer->ppFilterbank_prior_input[i][fb_cfg->prior_input_length - frame_len], ppOut_pcm[i], frame_len );

#ifdef HODIRAC

#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

        mvr2r( pcm_in[HOA_md_ind[i]], &ppOut_pcm[i][frame_len], frame_len );

#else

        mvr2r( pcm_in[HOA_keep_ind_spar[i]], &ppOut_pcm[i][frame_len], frame_len );

#endif

#else

        mvr2r( pcm_in[i], &ppOut_pcm[i][frame_len], frame_len );

#endif

lib_com/ivas_prot.h

+44 −1
Original line number Diff line number Diff line
@@ -3279,14 +3279,31 @@ int16_t ivas_sba_get_nchan( 
/*! r: number of ambisonics metadata channels */

int16_t ivas_sba_get_nchan_metadata(

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

#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

    ,

    const int32_t ivas_total_brate

#endif

);



#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

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           */

    int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] );



/*! r: flag indicating to code SPAR HOA MD for all bands */

void ivas_sba_get_spar_hoa_md_flag(

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

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

    int16_t *spar_hoa_md_flag,

    int16_t *spar_hoa_dirac2spar_md_flag );

#else

/*! r: flag indicating to code SPAR HOA MD for all bands */

int16_t ivas_sba_get_spar_hoa_md_flag(

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

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

);



#endif

void ivas_sba_zero_vert_comp(

    float sba_data[][L_FRAME48k],                               /* i/o: SBA data frame                          */

    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */
@@ -4205,6 +4222,12 @@ void ivas_get_spar_md_from_dirac( 
#endif

);



#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

int16_t ivas_get_spar_dec_md_num_subframes(

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

    const int32_t ivas_total_brate );

#endif



ivas_error ivas_spar_md_dec_open(

    ivas_spar_md_dec_state_t **hMdDec_out,                      /* i/o: SPAR MD decoder handle                  */

    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */
@@ -4255,11 +4278,19 @@ void ivas_spar_update_md_hist( 
void ivas_spar_smooth_md_dtx(

    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */

    const int16_t num_bands_out                                 /* i  : number of output bands                  */

	#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

    ,

    const int16_t num_md_sub_frames /* i  : number of metadata subframes      */

#endif

);



void ivas_spar_setup_md_smoothing(

    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */

    const int16_t num_bands_out                                 /* i  : number of output bands                  */

#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

    ,

    const int16_t num_md_sub_frames /* i  : number of metadata subframes      */

#endif

);



void ivas_spar_dec_gen_umx_mat(
@@ -4267,6 +4298,10 @@ void ivas_spar_dec_gen_umx_mat( 
    const int16_t nchan_transport,                              /* i  : number of transport channels            */

    const int16_t num_bands_out,                                /* i  : number of output bands                  */

    const int16_t bfi                                           /* i  : bad frame indicator                     */

#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

                               ,

    const int16_t num_md_sub_frames

#endif

);



/* Covariance module */
@@ -4294,6 +4329,10 @@ void ivas_enc_cov_handler_process( 
    const int16_t nchan_inp,

    const int16_t dtx_vad,

    const int16_t transient_det[2]

#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

    ,

    const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH]

#endif

);



ivas_error ivas_spar_covar_smooth_enc_open(
@@ -5121,6 +5160,10 @@ void ivas_fb_mixer_pcm_ingest( 
    float pcm_in[][L_FRAME48k],                                 /* i  : input audio channels                        */

    float **ppOut_pcm,                                          /* o  : output audio channels                       */

    const int16_t frame_length                                  /* i  : frame length                                */

#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

    ,

    const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH]

#endif

);



void ivas_dirac_enc_spar_delay_synchro(

lib_com/ivas_rom_com.c

+17 −1
Original line number Diff line number Diff line
@@ -952,11 +952,19 @@ const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN] = 
    { 512000, 0, SBA_FOA_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 128000, 128000, 128000 }, {118450, 118450, 128000 } }, // not yet optimized

    { { 31, 1, 1, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },



#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

    { 512000, 0, SBA_HOA2_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 124000, 124000, 128000 },{ 124000, 124000, 128000 },{ 125200, 118450, 128000 },{ 76300, 73000, 128000 } }, // not yet optimized

    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },



    { 512000, 0, SBA_HOA3_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 118000, 118000, 128000 },{ 118000, 118000, 128000 },{ 117200, 109250, 128000 },{ 72300, 69000, 128000 } },  // not yet optimized

    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },

#else

    { 512000, 0, SBA_HOA2_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 97700, 93300, 128000 } }, // not yet optimized

    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },



    { 512000, 0, SBA_HOA3_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 127200, 122550, 128000 },{ 76300, 73550, 128000 } },  // not yet optimized

    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },

#endif

};



const ivas_freq_models_t ivas_arith_pred_r_consts[TOTAL_PRED_QUANT_STRATS_ARITH] =
@@ -1482,11 +1490,19 @@ const int16_t remix_order_set[1][IVAS_SPAR_MAX_CH] = { /* WYZX --> WYXZ... */ 
    { 0, 1, 3, 2, 4, 5, 6, 7}

};

#endif



#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

const int16_t keep_planar[IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS] = { 1, 1, 1, 1, 1, 1 };

#else

const int16_t keep_planar[IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS] = { 1, 1, 1, 1 };

#endif

#ifdef HODIRAC

const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15};

#ifdef SPAR_HOA2_PLANAR_HOA3_DECOR_OPT

const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 8, 9, 10, 10, 10, 10};

const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4,  5, 6, 7, 8, 9, 10};

#else

const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 8, 9, 10};

#endif

#else

const int16_t HOA_keep_ind[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 8, 9, 15};

#endif