Commit 6fabfe47 authored by vaclav's avatar vaclav
Browse files

adapt FIX_562_ISM2_64KBPS for OMASA, fix is under MASA_AND_OBJECTS

parent 000d4009

lib_com/bitstream.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ int16_t get_ivas_max_num_indices( 
        else if ( ivas_total_brate <= IVAS_256k )

        {

#ifdef OMASA_BIT_BUFF_SZ

            return 1450;

            return 1300;

#else

            return 1150;

#endif

lib_com/ivas_ism_com.c

+10 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ ivas_error ivas_ism_config( 


    error = IVAS_ERR_OK;

#ifdef MASA_AND_OBJECTS

    if ( combined_format_flag == 1 )

    if ( combined_format_flag )

    {

        n_ISms = nchan_ism;

    }
@@ -365,7 +365,7 @@ ivas_error ivas_ism_config( 
        }



#ifdef FIX_562_ISM2_64KBPS

        /* limitaton to avoid too high bitrate in one active TCX channel */

        /* limitation to avoid too high bitrate in one active TCX channel */

        if ( element_brate[0] >= SCE_CORE_16k_LOW_LIMIT && element_brate[0] <= IVAS_32k )

        {

            diff = 0;
@@ -402,6 +402,13 @@ ivas_error ivas_ism_config( 
                            printf( "\nWarning: ISM bitbudget equal to SID!\n" );

                        }

#endif



#ifdef MASA_AND_OBJECTS

                        if ( combined_format_flag )

                        {

                            diff = 0;

                        }

#endif

                        break;

                    }

                }
@@ -409,7 +416,7 @@ ivas_error ivas_ism_config( 
        }



#ifdef MASA_AND_OBJECTS

        if ( combined_format_flag == 1 )

        if ( combined_format_flag )

        {

            if ( diff > 0 )

            {