Commit b4bbcdc3 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1885-duplication-of-vad-parameters

parents 585f27f7 7f594642

lib_com/ivas_cnst.h

+6 −1
Original line number Diff line number Diff line
@@ -1610,12 +1610,17 @@ typedef enum 
/*----------------------------------------------------------------------------------*

 * Amplitude Panning (EFAP, VBAP) constants

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



#ifndef FIX_1050_EFAP_ALLOC

#define PANNING_AZI_RESOLUTION                  2

#define PANNING_ELE_RESOLUTION                  5

#endif



#define EFAP_MAX_CHAN_NUM                       5                           /* Maximum number of channels that constitute a polygon, 4 or 5 */

#ifdef FIX_1050_EFAP_ALLOC

#define EFAP_MAX_POLY_SET                       54                          /* Upper bound on number of polygons; found to be 54 in the worst case for a speaker setup of 16.0 */

#else

#define EFAP_MAX_POLY_SET                       50                          /* Upper bound on number of polygons; with a Speaker setup of 16.0, we obtain 44 polygons/triangles in the matlab implementation. */

#endif



#define EFAP_MODE_EFAP                          0                           /* EFAP Panning */

#define EFAP_MODE_EFIP                          1                           /* EFIP Panning */

lib_com/ivas_dirac_com_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -397,13 +397,8 @@ void ivas_get_dirac_sba_max_md_bits_fx( 
        /* OSBA needs an additional 2-bits safety margin to avoid acelp crashes */

        IF( EQ_32( ivas_format, SBA_ISM_FORMAT ) )

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) = sub( ( *metadata_max_bits ), 7 );

            move16();

#else

            ( *metadata_max_bits ) = sub( ( *metadata_max_bits ), 3 );

            move16();

#endif

        }

    }

    ELSE IF( LE_32( sba_total_brate, IVAS_32k ) )

lib_com/ivas_prot_fx.h

+41 −18
Original line number Diff line number Diff line
@@ -2501,7 +2501,7 @@ Word16 ivas_sba_get_nchan_metadata_fx( 
);



#ifdef NONBE_FIX_1052_SBA_EXT

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

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

Word16 ivas_sba_spar_sid_bitlen_fx(

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

);
@@ -3500,7 +3500,9 @@ ivas_error ivas_qmetadata_enc_encode_hr_384_512_fx( 
    BSTR_ENC_HANDLE hMetaData,  /* i/o: metadata bitstream handle */

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

    const Word16 bits_sph_idx,

    const Word16 bits_sp_coh );

    const Word16 bits_sp_coh 

);



void ivas_merge_masa_metadata_fx(

    MASA_ENCODER_HANDLE hMasa,           /* i/o: MASA enc handle. source for MASA metadata and combined metadata will be here */

    OMASA_SPATIAL_META_HANDLE hOMasaMeta /* i  : ISM-object metadata to be merged with the MASA metadata                      */
@@ -3522,12 +3524,14 @@ void ivas_param_mc_enc_fx( 
    Word32 *data_f_fx[],       /* i/o: input/transport MC data                     Q11 */

    const Word16 input_frame   /* i  : input frame length                                   */

);



void ivas_merge_masa_transports_fx(

    Word32 data_in_f1_fx[][L_FRAME48k], // Qx

    Word32 *data_in_f2_fx[],            // Qx

    Word32 *data_out_f_fx[],            // Qx

    const Word16 input_frame,

    const Word16 num_transport_channels );

    const Word16 num_transport_channels 

);



void ivas_param_mc_enc_close_fx(

    PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle                        */
@@ -3626,11 +3630,18 @@ ivas_error ivas_masa_encode_fx( 
void ivas_write_format_sid_fx(

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

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

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

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

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

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

#else

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

#endif

);



void ivas_write_format_fx( /* i/o: IVAS encoder structure					*/

                           Encoder_Struct *st_ivas );

void ivas_write_format_fx( 

    Encoder_Struct *st_ivas                             /* i/o: IVAS encoder structure					*/

);



ivas_error create_sce_enc_fx(

    Encoder_Struct *st_ivas,                            /* i/o: IVAS encoder structure      */
@@ -3893,6 +3904,17 @@ ivas_error ivas_osba_render_sf_fx( 
    Word32 *p_output[]              /* o  : rendered time signal                      */

);



#ifdef NONBE_1894_OSBA_SCALING

void ivas_osba_stereo_add_channels_fx(

    Word32 *tc_fx[],                    /* i  : transport channels                */

    Word32 *output_fx[],                /* i/o: output channels                   */

    const Word16 gain,                  /* i  : gain bed value       Q11          */

    const Word16 nchan_out,             /* i  : number of output channels         */

    const Word16 nchan_ism,             /* i  : number of ISM channels            */

    const UWord16 n_samples_to_render   /* i  : output frame length per channel   */

);

#endif



void ivas_osba_data_close_fx(

    SBA_ISM_DATA_HANDLE *hSbaIsmData /* i/o: OSBA rendering handle                   */

);
@@ -5851,7 +5873,8 @@ ivas_error ivas_dirac_enc_fx( 
    const Word16 nchan_transport,  /* i  : number of transport channels            */

#endif

    const Word16 hodirac_flag,     /* i  : hodirac flag                            */

    const Word16 shift );

    const Word16 shift 

);



ivas_error ivas_spar_md_enc_init_fx(

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

lib_com/ivas_rom_com.c

+2 −1
Original line number Diff line number Diff line
@@ -1737,6 +1737,7 @@ const Word32 ivas_param_mc_dmx_fac_CICP19_3tc_fx[36] = 
    0,0,2147483647,2147483647,0,0,0,0,0,0,0,0 /*Ct*/

};



#ifndef FIX_1157_OBSOLETE_DMX_TABLE

const Word32 ivas_param_mc_dmx_fac_CICP19_4tc_fx[48] =

{

    2147483647,0,1518500224,1518500224,2147483647,0,2147483647,0,0,0,0,0, /*Lht*/
@@ -1744,7 +1745,7 @@ const Word32 ivas_param_mc_dmx_fac_CICP19_4tc_fx[48] = 
    0,0,0,0,0,0,0,0,2147483647,0,2147483647,0, /*Lut*/

    0,0,0,0,0,0,0,0,0,2147483647,0,2147483647 /*Rut*/

};



#endif



//Q15

const Word16 ivas_param_mc_ild_fac_CICP6_2tc_fx[6] =

lib_com/ivas_sba_config_fx.c

+3 −2
Original line number Diff line number Diff line
@@ -171,10 +171,10 @@ Word16 ivas_sba_get_nchan_fx( 
/*-------------------------------------------------------------------*

 * ivas_sba_spar_sid_bitlen_fx()

 *

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

Word16 ivas_sba_spar_sid_bitlen_fx(

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

)
@@ -191,6 +191,7 @@ Word16 ivas_sba_spar_sid_bitlen_fx( 
}

#endif





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

 * ivas_sba_get_nchan_metadata()

 *