Commit 588760e2 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 511-optimise-target-gain-computation-in-parametric-binauralizer
parents 8a5ed092 92420d58

lib_com/ivas_error.h

+4 −0
Original line number Diff line number Diff line
@@ -235,7 +235,11 @@ 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

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ 
#define FIX_483                                         /* FhG: fix issue 483, division by zero in nois_est */

#define FIX_483b                                        /* FhG: fix issue 483, uninitialized values in ivas_mct_core_enc */

#define FIX_170_DTX_MASA                                /* Nokia: Fix issue 170, relaxing the use of DTX in MASA format */



#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_511_OPTIMIZE_PARAMBIN_GAIN_FETCH            /* Nokia: Issue 511, significant optimization of parametric binauralizer gain fetching. */

lib_dec/lib_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -3211,7 +3211,11 @@ 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;

    }