Commit 75a3bf0e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_509

parent a1d47617

lib_com/bitstream.c

+0 −8
Original line number Diff line number Diff line
@@ -776,19 +776,11 @@ int16_t get_ivas_max_num_indices_metadata( /* o 
        }

        else if ( ivas_total_brate <= IVAS_384k )

        {

#ifdef FIX_509

            return 2000;

#else

            return 1500;

#endif

        }

        else

        {

#ifdef FIX_509

            return 2500;

#else

            return 2000;

#endif

        }

    }

    else if ( ivas_format == MASA_FORMAT )

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -235,11 +235,7 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

        case IVAS_ERR_INVALID_INPUT_FORMAT:

#ifdef FIX_510

            return "Invalid input format";

#else

            return "Invalid format of input bitstream";

#endif

        case IVAS_ERR_INVALID_INDEX:

            return "Invalid index";

        default:

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ 


#define FIX_506_WARNINGS                                /* FhG/Eri/Dlb/VA: Issue 508, Warnings on MacOS */

#define FIX_296_CFG_LFE_SCENE_DESC                       /* FhG: Fix issue 296 - add configurable LFE handling to the scene description file */

#define FIX_510                                         /* FhG: fix issue 510, misleading error message for invalid input format */

#define FIX_509                                         /* FhG: fix issue 509, too low number of bitsream indices in SBA */

#define FIX_519_JBM_ACCESS_NULL_TC_BUFFER               /* FhG: fix issue 519, accessing a yet uninitialized TC Buffer in frame 0*/

#ifdef IND_LIST_DYN

#define FIX_545_ASSERT                                  /* VA: fix issue 545, replace assert() with warning message when hitting memory limit in the buffer of indices */

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2927,11 +2927,7 @@ static ivas_error input_format_API_to_internal( 
            *sdp_hf_only = 1;

            break;

        default:

#ifdef FIX_510

            return IVAS_ERR_INVALID_BITSTREAM;

#else

            return IVAS_ERR_INVALID_INPUT_FORMAT;

#endif

            break;

    }