Commit ca764e25 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

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

Merge remote-tracking branch 'origin/main' into 1452-default-reverb-configuration-not-affecting-ivas_rend-properly
parents ee88c24d d804c8e9

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -3115,7 +3115,7 @@ static ivas_error printBitstreamInfoVoip( 
{

    bool previewFailed = true;

    ivas_error error = IVAS_ERR_OK;

    IVAS_RTP ivasRtp;

    IVAS_RTP ivasRtp = { 0 };

    uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];

    int16_t auSizeBits;

    uint8_t *auPtr = NULL;

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ int main( 
    /* Set reverb room size if specified */

    if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO )

    {

        if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError setting reverb room size\n" );

            goto cleanup;

lib_com/ivas_dirac_com.c

+0 −4
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ void ivas_get_dirac_sba_max_md_bits( 
        *metadata_max_bits = MAX16B; /* no limit */

    }



#ifdef FIX_FLOAT_1544_SBA_META_IMPRECISION_UNSAFE_MATH

    /*

      original formula was:

      *metadata_max_bits = (int16_t) min( (float) MAX16B, ceilf( (float) *metadata_max_bits * nbands / 5 ) );
@@ -393,9 +392,6 @@ void ivas_get_dirac_sba_max_md_bits( 
      certain optimizations using -funsafe-math-optimizations

    */

    *metadata_max_bits = (int16_t) min( (float) MAX16B, ceilf( *metadata_max_bits * nbands * 0.2f ) );

#else

    *metadata_max_bits = (int16_t) min( (float) MAX16B, ceilf( (float) *metadata_max_bits * nbands / 5 ) );

#endif

    *qmetadata_max_bit_req = QMETADATA_MAXBIT_REQ_SBA >> 1;



    return;

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -1049,11 +1049,7 @@ ivas_error ivas_ism_metadata_dec( 
    const int16_t bfi,                                          /* i  : bfi flag                                    */

    int16_t nb_bits_metadata[],                                 /* o  : number of metadata bits                     */

    ISM_MODE ism_mode,                                          /* i  : ISM mode                                    */

#ifdef FIX_1547_ISMDTX_HANDLE

    ISM_DTX_DATA_DEC *hISMDTX,                                  /* i/o: ISM DTX handle                              */

#else

    ISM_DTX_DATA_DEC hISMDTX,                                   /* i/o: ISM DTX structure                           */

#endif

    const PARAM_ISM_CONFIG_HANDLE hParamIsm,                    /* i  : Param ISM Config Handle                     */

    int16_t *ism_extended_metadata_flag,                        /* i/o: Extended metadata active in renderer        */

    int16_t *ism_extmeta_cnt,                                   /* i/o: Number of change frames observed            */

lib_com/options.h

+4 −9
Original line number Diff line number Diff line
@@ -161,10 +161,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN            /* Eri: Basop issue 2469: TD renderer gain has wrong Q. In float this is just a synch of the cleanup done in BASOP */

#define FIX_ISSUE_1546_DEAD_CODE                        /* FhG: remove dead code reported in the issue*/

#define FIX_FLOAT_1544_SBA_META_IMPRECISION_UNSAFE_MATH /* FhG: float issue 1544: imprecision in ivas_get_dirac_sba_max_md_bits() with -funsafe-math-optimizations */

#define FIX_FLOAT_1544_ITD_IMPRECISION_UNSAFE_MATH      /* FhG: float issue 1544: Avoid assert() with -funsafe-math-optimizations in stereo_td_itd() */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_1527_CMR_BITRATE_IDX                        /* Fix for incorrect bitrate idx packed in rtp CMR E-byte */
@@ -173,12 +169,11 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */



#define FIX_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */

#define FIX_1543_MID_LSF_BITS                           /* VA: float issue 1543: Resolve "MSAN: use-of-uninitialized-value in lib_enc/lsf_enc.c:262:5 for EVS encoder" */

#define FIX_1547_ISMDTX_HANDLE                          /* VA: float issue 1547: fix use of 'hISMDTX' handle */

#define USE_RTPDUMP                                     /* FhG: RTPDUMP format (rtptools standard) instead of custom format */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_1563_FIX_STEREO_SW                          /* VA: float issue 1563: fix clicks in stereo switching */

#define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */

#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */

#define FIX_1571_BFI_COPY_ARRAY_CORRECT_LEN             /* FhG: issue 1571: use correct channel signal length for copying signal to buffer */

#define FIX_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */



/* ##################### End NON-BE switches ########################### */