Commit 65867b68 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 562-ism2-at-64kbps-performs-worse-than-at-48-kbps
parents 9b47beb1 daca8536

apps/decoder.c

+20 −0
Original line number Diff line number Diff line
@@ -1580,7 +1580,11 @@ static ivas_error initOnFirstGoodFrame( 


            /* Duplicate good first frame metadata to fill the beginning of stream. */

            MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;

#ifdef FIX_470_MASA_JBM_EXT

            if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )

#endif

            {

                fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                return error;
@@ -1878,7 +1882,11 @@ static ivas_error decodeG192( 
            else if ( bsFormat == IVAS_DEC_BS_MASA )

            {

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

#ifdef FIX_470_MASA_JBM_EXT

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )

#endif

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;
@@ -2426,7 +2434,11 @@ static ivas_error decodeVoIP( 
                else if ( bsFormat == IVAS_DEC_BS_MASA )

                {

                    MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

#ifdef FIX_470_MASA_JBM_EXT

                    if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 1 ) ) != IVAS_ERR_OK )

#else

                    if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )

#endif

                    {

                        fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                        goto cleanup;
@@ -2838,7 +2850,11 @@ static ivas_error decodeVariableSpeed( 
            else if ( bsFormat == IVAS_DEC_BS_MASA )

            {

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

#ifdef FIX_470_MASA_JBM_EXT

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 1 ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )

#endif

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;
@@ -3008,7 +3024,11 @@ static ivas_error decodeVariableSpeed( 
            else if ( bsFormat == IVAS_DEC_BS_MASA )

            {

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

#ifdef FIX_470_MASA_JBM_EXT

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )

#endif

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

lib_com/core_com_config.c

+8 −9
Original line number Diff line number Diff line
@@ -165,9 +165,9 @@ int16_t get_codec_mode( 
int16_t getTcxonly(

    const int16_t element_mode, /* i  : IVAS element mode                   */

    const int32_t total_brate,  /* i  : total bitrate                       */

    const int16_t MCT_flag      /* i  : hMCT handle allocated (1) or not (0)*/

    ,

    const int16_t is_ism_format )

    const int16_t MCT_flag,     /* i  : hMCT handle allocated (1) or not (0)*/

    const int16_t is_ism_format /* i  : flag indicating ISM format          */

)

{

    int16_t tcxonly = 0;
@@ -357,8 +357,7 @@ int32_t getCoreSamplerateMode2( 
    const int32_t total_brate,      /* i  : total bitrate                  */

    const int16_t bwidth,           /* i  : audio bandwidth                */

    const int16_t flag_ACELP16k,    /* i  : ACELP@16kHz flag               */

    const int16_t rf_mode        /* i  : flag to signal the RF mode     */

    ,

    const int16_t rf_mode,          /* i  : flag to signal the RF mode     */

    const IVAS_FORMAT is_ism_format /* i  : flag indicating ISM format     */

)

{

lib_com/ivas_cnst.h

+9 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ typedef enum 
#define MAX_JBM_L_FRAME_NS                      40000000L

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#define MAX_CLDFB_DIGEST_CHANNELS               4

#ifdef FIX_470_MASA_JBM_EXT

#define MASA_JBM_RINGBUFFER_FRAMES              3

#endif



typedef enum

{
@@ -310,6 +313,9 @@ typedef enum 
#define MIN_BRATE_SWB_SCE                       ACELP_9k60                  /* min. SCE bitrate where SWB is supported */

#define MIN_BRATE_SWB_STEREO                    IVAS_13k2                   /* min. stereo bitrate where SWB is supported */

#define MIN_BRATE_FB_STEREO                     IVAS_32k                    /* min. SCE and stereo bitrate where FB is supported */

#ifdef ISM_FB

#define MIN_BRATE_FB_ISM                        24000                       /* min. SCE bitrate where FB is supported in ISM format */

#endif



#define MIN_TDM_BRATE_WB_TBE_1k05               12000                       /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */

#define MIN_BRATE_WB_TBE_1k05                   9650                        /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */
@@ -1420,6 +1426,9 @@ typedef enum 
#define PARAM_MC_MAX_BAND_ABS_COV_DEC           10

#define PARAM_MC_ENER_LIMIT_INTRAFRAME          (1.5f)

#define PARAM_MC_ENER_LIMIT_INTERFRAME          (2.0f)

#ifdef FIX_563_PARAMMC_LIMITER

#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC       (15.0f)

#endif

#define PARAM_MC_LFE_ON_THRESH                  (8000.0f)

#define PARAM_MC_BAND_TO_MDCT_BAND_RATIO        16                          /* Ratio of resolution of CLDFB Bands to MDCT Bands */

#define PARAM_MC_SLOT_ENC_NS                    2500000L

lib_com/ivas_dirac_com.c

+1 −3
Original line number Diff line number Diff line
@@ -94,10 +94,8 @@ ivas_error ivas_dirac_config( 
    ivas_error error;

    int16_t spar_dirac_split_band;

    IVAS_FB_MIXER_HANDLE hFbMdft;



    int16_t *dirac_to_spar_md_bands;





    error = IVAS_ERR_OK;



    if ( enc_dec == ENC )
@@ -176,7 +174,6 @@ ivas_error ivas_dirac_config( 
            hConfig->enc_param_start_band = hQMetaData->q_direction[0].cfg.start_band + spar_dirac_split_band;

        }





        hConfig->dec_param_estim = TRUE;

        if ( hConfig->dec_param_estim == TRUE )

        {
@@ -452,6 +449,7 @@ ivas_error ivas_dirac_sba_config( 
            return error;

        }

    }



    ivas_get_dirac_sba_max_md_bits( sba_total_brate, &hQMetaData->bits_frame_nominal, &hQMetaData->metadata_max_bits, &hQMetaData->qmetadata_max_bit_req, hQMetaData->q_direction[0].cfg.nbands );



    return error;

lib_com/ivas_ism_com.c

+4 −0
Original line number Diff line number Diff line
@@ -572,6 +572,10 @@ void ivas_param_ism_config( 
        hParamIsm->last_el_sgn[i] = 1;

    }



#ifdef FIX_549_DMX_GAIN

    hParamIsm->last_dmx_gain = 1.0f;

    set_f( hParamIsm->last_cardioid_left, 1.0f, MAX_NUM_OBJECTS );

#endif

    return;

}