Commit 4b5633e2 authored by emerit's avatar emerit
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec

parents 3bb8439d 884471d4

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -1787,7 +1787,7 @@ IsmPositionProvider *IsmPositionProvider_open( 
    IsmPositionProvider *ipp;

    uint16_t i;



    ipp = (IsmPositionProvider *) malloc_( sizeof( IsmPositionProvider ) );

    ipp = (IsmPositionProvider *) malloc( sizeof( IsmPositionProvider ) );

    ipp->frameCounter = 0;

    ipp->numObjects = 0;
@@ -2182,8 +2182,8 @@ static void parseIsm( 
    if ( parseUint32( line, &numberOfObjectPositionsToRead ) == 0 )

    {

        positionProvider->numPositions[idx] = numberOfObjectPositionsToRead;

        positionProvider->positions[idx] = malloc_( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) );

        positionProvider->positionDurations[idx] = malloc_( numberOfObjectPositionsToRead * sizeof( uint16_t ) );

        positionProvider->positions[idx] = malloc( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) );

        positionProvider->positionDurations[idx] = malloc( numberOfObjectPositionsToRead * sizeof( uint16_t ) );



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

        {

lib_com/bitstream.c

+25 −15
Original line number Diff line number Diff line
@@ -1914,7 +1914,11 @@ ivas_error preview_indices( 
                k = IVAS_FORMAT_SIGNALING_NBITS;

                if ( st_ivas->ivas_format == MASA_FORMAT )

                {

#ifdef COMBINED_FORMAT_SIGNALING

                    k = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED;

#else

                    k = IVAS_FORMAT_SIGNALING_NBITS_SBA;

#endif

                }



                if ( total_brate < MIN_BRATE_MDCT_STEREO )
@@ -1954,9 +1958,15 @@ ivas_error preview_indices( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            /* Read SBA planar flag and SBA order */

#ifdef COMBINED_FORMAT_SIGNALING

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED] == 1 );

            st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 2] == 1 );

            st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 1] == 1 );

#else

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 );

            st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );

            st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );

#endif



            st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order );

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -78,7 +78,11 @@ typedef enum 
 *----------------------------------------------------------------------------------*/



#define IVAS_FORMAT_SIGNALING_NBITS             2                           /* number of bits for signaling the IVAS format */

#ifdef COMBINED_FORMAT_SIGNALING

#define IVAS_FORMAT_SIGNALING_NBITS_EXTENDED    ( IVAS_FORMAT_SIGNALING_NBITS + 1 )

#else

#define IVAS_FORMAT_SIGNALING_NBITS_SBA         ( IVAS_FORMAT_SIGNALING_NBITS + 1 )

#endif





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

lib_com/ivas_spar_com.c

+5 −0
Original line number Diff line number Diff line
@@ -2154,8 +2154,13 @@ void ivas_spar_set_bitrate_config( 
        max_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].core_brs[i][1] / FRAMES_PER_SEC );

    }



#ifdef COMBINED_FORMAT_SIGNALING

    pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits;

    pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits;

#else

    pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits;

    pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits;

#endif



    md_coding_bits_header = SPAR_NUM_CODING_STRAT_BITS + pSpar_md_cfg->quant_strat_bits;

lib_com/ivas_stat_com.h

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ typedef struct ivas_param_ism_data_structure 


    int16_t flag_noisy_speech;

    int16_t noisy_speech_buffer[PARAM_ISM_HYS_BUF_SIZE];

#ifdef FIX_440_PARAM_ISM_DIR_NOISE

    int16_t flag_equal_energy;

#endif



} PARAM_ISM_CONFIG_DATA, *PARAM_ISM_CONFIG_HANDLE;