Commit 19cda92b authored by vaclav's avatar vaclav
Browse files

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

- Merge remote-tracking branch 'remotes/origin/main' into basop-2296-ivas_jbm_dec_tc-remove-unused-code
parents e68cb3c4 adcfd8e3

Workspace_msvc/lib_isar.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ 
    <ClCompile Include="..\lib_isar\isar_lc3plus_enc.c" />

    <ClCompile Include="..\lib_isar\isar_lc3plus_payload.c" />

    <ClCompile Include="..\lib_isar\isar_MSPred.c" />

    <ClCompile Include="..\lib_isar\isar_NoiseGen.c" />

    <ClCompile Include="..\lib_isar\isar_PerceptualModel.c" />

    <ClCompile Include="..\lib_isar\isar_PredDecoder.c" />

    <ClCompile Include="..\lib_isar\isar_PredEncoder.c" />

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -452,6 +452,13 @@ int main( 
            fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR

        if ( !arg.renderConfigEnabled && ( arg.renderFramesize != asked_frame_size ) )

        {

            fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );

        }

#endif

    }



    /*------------------------------------------------------------------------------------------*

lib_com/gs_noisefill_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -751,11 +751,19 @@ void highband_exc_dct_in_fx( 
    test();

    IF( bfi || LT_32( core_brate, 6000 ) || ( LT_32( core_brate, 8600 ) && EQ_16( coder_type, UNVOICED ) ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 13107, MBANDS_GN ); /*0.4 in Q15 */

#else

        set16_fx( noisepb, 13107, last_bin ); /*0.4 in Q15 */

#endif

    }

    ELSE IF( EQ_16( GSC_IVAS_mode, 3 ) || ( GSC_IVAS_mode > 0 && EQ_16( GSC_noisy_speech, 1 ) ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 13107 /*0.4f*/, MBANDS_GN16k );

#else

        set16_fx( noisepb, 13107 /*0.4f*/, last_bin );

#endif

    }

    ELSE

    {
@@ -772,7 +780,11 @@ void highband_exc_dct_in_fx( 
    test();

    IF( GSC_IVAS_mode == 0 && GSC_noisy_speech && !bfi && LE_16( element_mode, IVAS_SCE ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 3277, MBANDS_GN );

#else

        set16_fx( noisepb, 3277, last_bin );

#endif

    }

    test();

    IF( LT_32( core_brate, 6000 ) && LE_16( coder_type, UNVOICED ) )

lib_com/ifft_rel_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -139,7 +139,12 @@ void ifft_rel_fx( 
        /*Can be acheived with a shr */

        step = idiv1616( N_MAX_SAS, n2 );

        move16();



#ifdef FIX_2268_OOB_INDEXING_IN_IFFT

        IF( LT_16( n8, 2 ) )

        {

            continue;

        }

#endif

        s = sincos_t_fx + step;                /*Q15 */

        c = s + 64;                            /*Q15 */

        s3 = sincos_t_fx + i_mult2( step, 3 ); /*Q15 */

lib_com/ivas_cnst.h

+5 −5
Original line number Diff line number Diff line
@@ -186,12 +186,12 @@ typedef enum 
#define IVAS_NUM_SUPPORTED_FS                   3                           /* number of supported sampling-rates in IVAS */



#define CLDFB_SLOT_NS                           1250000L                    /* 1.25ms: CLDFB slot length */

#define MAX_JBM_SUBFRAMES_5MS                   8

#define DEFAULT_JBM_SUBFRAMES_5MS               4

#define JBM_CLDFB_SLOTS_IN_SUBFRAME             4

#define DEFAULT_JBM_SUBFRAMES_5MS               4                           /* == IVAS_MAX_PARAM_SPATIAL_SUBFRAMES */

#define MAX_JBM_SUBFRAMES_5MS                   ( DEFAULT_JBM_SUBFRAMES_5MS * 2 )

#define JBM_CLDFB_SLOTS_IN_SUBFRAME             4                           /* == IVAS_MAX_PARAM_SPATIAL_SUBFRAMES */

#define JBM_CLDFB_SLOTS_IN_SUBFRAME_LOG2        2                           /* To be used for shift operation instead of division */

#define MAX_JBM_CLDFB_TIMESLOTS                 32

#define DEFAULT_JBM_CLDFB_TIMESLOTS             16

#define DEFAULT_JBM_CLDFB_TIMESLOTS             CLDFB_NO_COL_MAX

#define MAX_JBM_CLDFB_TIMESLOTS                 ( DEFAULT_JBM_CLDFB_TIMESLOTS * 2 )

#define MAX_JBM_L_FRAME48k                      ( IVAS_MAX_FRAME_SIZE * 2 ) /* 1920:  max. time-scaled frame buffer length (per channel) in samples */

#define MAX_JBM_L_FRAME_NS                      40000000L                   /* 40 ms: time-scaled frame size in ns, proportional to MAX_JBM_L_FRAME48k  */

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH