Commit f54989de authored by multrus's avatar multrus
Browse files

Merge branch '20250113_cleanup' into 'main' 

20250113 cleanup

See merge request !1948
parents 783c4431 60fce181

apps/decoder.c

+0 −8
Original line number Diff line number Diff line
@@ -3895,11 +3895,7 @@ static ivas_error load_hrtf_from_file( 
                return error;

            }



#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

            if ( ( error = load_TDrend_HRTF_binary( *hHrtfBinary->hHrtfTD, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_HRTF_binary( *hHrtfBinary->hHrtfTD, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {
@@ -3983,11 +3979,7 @@ static ivas_error load_hrtf_from_file( 
        }

    }



#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

    if ( hHrtfBinary->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

    if ( hHrtfBinary->hHrtfStatistics == NULL )

#endif

    {

        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfBinary->hHrtfStatistics ) ) != IVAS_ERR_OK )

        {

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -957,11 +957,7 @@ int main( 
                goto cleanup;

            }



#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

            if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -82,9 +82,7 @@ typedef enum 
    IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,

#endif

    IVAS_ERR_INVALID_HRTF,

#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

    IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,

#endif

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,

    IVAS_ERR_INVALID_INPUT_FORMAT,

    IVAS_ERR_INVALID_INDEX,
@@ -269,10 +267,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
#endif

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

            return "Wrong sampling rate in HRTF binary file";

#endif

        case IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA:

            return "Renderer data missing in HRTF binary file";

        case IVAS_ERR_INVALID_INPUT_FORMAT:

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -203,9 +203,7 @@ ivas_error pre_proc_front_ivas( 
    const int16_t front_vad_dtx_flag,                           /* i  : front-VAD DTX flag to overwrite VAD decision*/

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                                */

    const int16_t MCT_flag,                                     /* i  : hMCT handle allocated (1) or not (0)       */

#ifdef NONBE_1211_DTX_BR_SWITCHING

    const int32_t last_ivas_total_brate,                        /* i  : last IVAS total bitrate                    */

#endif

    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                         */

);

lib_com/options.h

+0 −6
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE    /* VA: issue 1228: Exit the processing when a HRTF binary file with wrong sampling rate is provided */

#define FIX_1225_DISCLAIMER                             /* VA: issue 1225: Add disclaimer for external renderer + Add info about IVAS reference version */

#define FIX_1179_USAN_PHASEECU                          /* Eri: issue 1179:  better handling of 16 bit wrap around for very long(>200ms) FER-bursts   */

#define FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX          /* VA: issue 1249: remove obsolete code around ALLRAD decoder matrix */
@@ -173,11 +172,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1240_FIX_CORE_SELECTION_ISM_SW            /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */

#define NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX      /* Ericsson: Issue 1246: High level input which triggers DTX can lead to numerical overflow in coherence calculation */

#define NONBE_1211_DTX_BR_SWITCHING                     /* VA: issue 1211: fix crash in MASA DTX bitrate switching */

#define NONBE_1217_INIT_OBJ_EDIT                        /* VA: issue 1217: do object editing only when objects metadata is available */

#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */



#define NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP        /* Nokia: Fixes ivas_decode_masaism_metadata decision logic change due to precision difference; this is the fix in floating point */