Commit 0fe671ec authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_502_IND_LIST_SIZE

parent e406fff2

lib_com/bitstream.c

+0 −36
Original line number Diff line number Diff line
@@ -803,59 +803,31 @@ int16_t get_ivas_max_num_indices_metadata( /* o 
        }

        else if ( ivas_total_brate <= IVAS_32k )

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 125;

#else

            return 110;

#endif

        }

        else if ( ivas_total_brate <= IVAS_48k )

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 205;

#else

            return 180;

#endif

        }

        else if ( ivas_total_brate <= IVAS_96k )

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 240;

#else

            return 200;

#endif

        }

        else if ( ivas_total_brate <= IVAS_128k )

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 305;

#else

            return 250;

#endif

        }

        else if ( ivas_total_brate <= IVAS_160k )

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 425;

#else

            return 320;

#endif

        }

        else if ( ivas_total_brate <= IVAS_192k )

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 630;

#else

            return 430;

#endif

        }

        else if ( ivas_total_brate <= IVAS_256k )

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 850;

#else

            return 600;

#endif

        }

        else if ( ivas_total_brate <= IVAS_384k )

        {
@@ -863,11 +835,7 @@ int16_t get_ivas_max_num_indices_metadata( /* o 
        }

        else

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 1750;

#else

            return 1500;

#endif

        }

    }

    else if ( ivas_format == MC_FORMAT )
@@ -882,11 +850,7 @@ int16_t get_ivas_max_num_indices_metadata( /* o 
        }

        else if ( ivas_total_brate <= IVAS_64k )

        {

#ifdef FIX_502_IND_LIST_SIZE

            return 210;

#else

            return 200;

#endif

        }

        else if ( ivas_total_brate <= IVAS_96k )

        {

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ 
#define FIX_501_TABLE_IDX_INIT                          /* Dlb: Fix for the issue 501 */





#define FIX_502_IND_LIST_SIZE                           /* Fix issue #502: insufficient index buffer sizes */



#define FIX_505_MASA_SPHGRID_REUSE                      /* Nokia: Fix issue #505: MASA spherical grid reuse fix */