Commit fd1b329a authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/no-diegetic-pan-with-radius

parents 2e3ad853 4020bc58

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ 
#define FIX_CRASH_EVS_BITSTREAM_WITH_OUTPUT

#define ISM_NO_DIEGETIC_PAN

#define FIX_376_SBA_ROTATE                             /*DLB: Fix for issue 376*/

#define FIX_372_LIB_REND_VALIDATE_IO                    /* FhG: Issue 372: IVAS_rend segfaults with unsupported I/O configs - add validation checks of I/O config */

#define FIX_376_SBA_ROTATE                              /*DLB: Fix for issue 376*/



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_enc/ivas_ism_enc.c

+0 −31
Original line number Diff line number Diff line
@@ -210,37 +210,6 @@ ivas_error ivas_ism_enc( 
    }

    else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

    {

#ifndef PARAM_ISM_DTX_CNG

        /* Move the Noisy speech buffer */

        for ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ )

        {

            st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i + 1];

        }



        /* For the current frame, make a decision based on some core-coder flags */

        if ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr )

        {

            if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag )

            {

                st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0;

            }

            else

            {

                st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 1;

            }

        }

        else

        {

            st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0;

        }



        /* Do a decision based on hysterisis */

        st_ivas->hDirAC->hParamIsm->flag_noisy_speech = 1;

        for ( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ )

        {

            st_ivas->hDirAC->hParamIsm->flag_noisy_speech = st_ivas->hDirAC->hParamIsm->flag_noisy_speech && st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i];

        }

#endif

#ifdef TD5

        ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag );

#else

scripts/testv/FEC_6pct.bin

deleted100644 → 0LFS
−130 B

File deleted.

View file

scripts/testv/FEC_6pct2.bin

deleted100644 → 0LFS
−130 B

File deleted.

View file

scripts/testv/PLperc12mblen5.g192

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k k!k!k!k!k!k!k!k!k!k!k!k!k!k k k!k!k!k!k!k!k!k!k!k!k!k!k!k!k k!k!k!k!k!k!k!k!k!k!k k k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k k k k k k!k!k!k!k!k!k k k!k!k!k!k!k!k!k k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k k!k k k!k!k!k!k!k!k!k!k k k k!k!k!k!k!k!k!k!k!k!k!k!k k!k!k!k!k!k!k!k!k!k!k!k!k!k k k k!k!k!k!k!k!k!k!k!k!k!k!k k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k k k k!k!k!k k k!k!k!k!k!k!k k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k!k
 
 No newline at end of file