Commit 9a35b738 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch '502-masa-hits-assert-in-check_ind_list_limits-at-bitrates-160k-256k' into 'main' 

Resolve #502 "MASA hits assert in check_ind_list_limits at bitrates 160k-256k"

See merge request !678
parents e8217733 e4fa3cc0

lib_com/bitstream.c

+36 −0
Original line number Diff line number Diff line
@@ -791,31 +791,59 @@ 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 )

        {
@@ -823,7 +851,11 @@ 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 )
@@ -838,7 +870,11 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ 
#define FIX_I503_ASAN_ERROR_IND_LIST                    /* VA: fix issue #503: address sanitizer error with IND_LIST_DYN */

#define FIX_473_JITTER_NONDIEGETIC_PANNING              /* FhG,Orange: add missing non-diegetic panning to JITTER */



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



#ifdef HR_METADATA

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

#endif