Commit 010fe58e authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents 5f3609b0 652e1ce2

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1031,7 +1031,7 @@ check-first-frame-is-sid: 
    expose_as: "logs-sidstart"

    expire_in: "5 days"



lc3plus-ensure-no-code-changes:

.lc3plus-ensure-no-code-changes:

  extends:

    - .test-job-linux

    - .rules-merge-request

lib_com/ivas_prot.h

+4 −1
Original line number Diff line number Diff line
@@ -769,7 +769,10 @@ void dtx_read_padding_bits( 
);



void ivas_apply_non_diegetic_panning( 

    float *output_f[],                                          /* i/o: core-coder transport mono channel/stereo output             */

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    float *input_f,                                             /* i  : non-diegetic object                                         */

#endif

    float *output_f[],                                          /* o  : core-coder transport mono channel/stereo output             */

    const float non_diegetic_pan_gain,                          /* i  : non-diegetic panning gain                                   */

    const int16_t output_frame                                  /* i  : output frame length per channel                             */

);

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define FIX_901_PARAMMC_DEAD_CODE                       /* FhG: issue 901: remove dead ParamMC code             */

#define FIX_1008_EXTORIENT_TARGET_INTERPOLATION         /* FhG: issue #1008, external orientation init was wrong for 5ms */

#define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */





/* #################### End BE switches ################################## */
@@ -179,6 +180,8 @@ 
#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF                    /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */

#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER                  /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS                  /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

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



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

lib_dec/ivas_jbm_dec.c

+15 −0
Original line number Diff line number Diff line
@@ -1120,7 +1120,11 @@ ivas_error ivas_jbm_dec_render( 
            }

            else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )

            {

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

                ivas_apply_non_diegetic_panning( p_tc[0], p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

#else

                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

#endif

            }

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )
@@ -1586,8 +1590,12 @@ ivas_error ivas_jbm_dec_flush_renderer( 
    int16_t n_slots_still_available;

    int16_t n_samples_to_render;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;

#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

    float *p_output[MAX_CICP_CHANNELS + MAX_NUM_OBJECTS];

#else

    float output[MAX_CICP_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];

    float *p_output[MAX_CICP_CHANNELS];

#endif



    if ( !st_ivas->hDecoderConfig->Opt_tsm )

    {
@@ -1632,10 +1640,17 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        hTcBuffer->n_samples_flushed = n_samples_to_render;

        hTcBuffer->n_samples_rendered = 0;



#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

        for ( ch_idx = 0; ch_idx < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch_idx++ )

        {

            p_output[ch_idx] = st_ivas->p_output_f[ch_idx];

        }

#else

        for ( ch_idx = 0; ch_idx < MAX_CICP_CHANNELS; ch_idx++ )

        {

            p_output[ch_idx] = output[ch_idx];

        }

#endif



        if ( st_ivas->ivas_format == ISM_FORMAT )

        {

lib_dec/ivas_masa_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -142,6 +142,13 @@ ivas_error ivas_masa_decode( 
        st->next_bit_pos = (int16_t) ( ( masa_brate / FRAMES_PER_SEC ) - 1 );

    }



#ifdef NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS

    if ( ivas_format == MASA_FORMAT && ( masa_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) )

    {

        hMasa->config.numberOfDirections = 1;

    }

#endif



    if ( !st->bfi && ivas_total_brate > IVAS_SID_5k2 )

    {

        if ( !( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) )