Commit 63ed0dd1 authored by bayers's avatar bayers
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 841-mc-rs-hrft-handle-not-set-to-null

parents 8038a1f7 ebc7f53c

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1334,7 +1334,7 @@ sanitizer-test-masa: 
    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 21 hours

  timeout: 3 hours

  timeout: 5 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ 
#define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT              /* FhG: issue #825: Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output"   */

#define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */

#define NONBE_FIX_846_JBM_MASA_SIDSTART                       /* FhG: Issue #846: fix JBM for MASA DTX when the first frame is a SID frame */

#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER                    /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */

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

lib_dec/ivas_jbm_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -2034,7 +2034,11 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
        {

            num_tc = CPE_CHANNELS;

        }

        else if ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE && ( ivas_total_brate > IVAS_SID_5k2 || ( ivas_total_brate <= IVAS_SID_5k2 && st_ivas->nCPE > 0 && st_ivas->hCPE[0]->nchan_out == 1 ) ) )

        else if ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE && ( ivas_total_brate > IVAS_SID_5k2 || ( ivas_total_brate <= IVAS_SID_5k2 && st_ivas->nCPE > 0 &&

#ifdef NONBE_FIX_846_JBM_MASA_SIDSTART

                                                                                                                                              st_ivas->hCPE[0] != NULL &&

#endif

                                                                                                                                              st_ivas->hCPE[0]->nchan_out == 1 ) ) )

        {

            num_tc = 1; /* Only one channel transported */

        }

lib_enc/ivas_sns_enc.c

+3 −16
Original line number Diff line number Diff line
@@ -410,7 +410,6 @@ int16_t quantize_sns( 
    idxIndices = 0;

    set_f( weights, 1.0f, M );



    /* stereo mode decision */

    sns_stereo_mode[0] = SNS_STEREO_MODE_LR;

    sns_stereo_mode[1] = SNS_STEREO_MODE_LR;

    zero_side_flag[0] = 0;
@@ -426,6 +425,7 @@ int16_t quantize_sns( 
        }

    }



    /* stereo mode decision */

    if ( sts[0]->core == sts[1]->core )

    {

        nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV;
@@ -448,20 +448,7 @@ int16_t quantize_sns( 
        }

    }



    /* prepare buffers depending on the chosen stereo mode */





    nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV;

    for ( k = 0; k < nSubframes; ++k )

    {

        mvr2r( sns_in[0][k], snsQ_out[0][k], M );

        mvr2r( sns_in[1][k], snsQ_out[1][k], M );

        if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS )

        {

            convertToMS( M, snsQ_out[0][k], snsQ_out[1][k], 0.5f );

        }

    }



    /* run MSVQ */

    for ( ch = 0; ch < CPE_CHANNELS; ++ch )

    {

        st = sts[ch];
@@ -507,6 +494,7 @@ int16_t quantize_sns( 
        }

    }



    /* get back to L/F representation */

    if ( sns_stereo_mode[0] == SNS_STEREO_MODE_MS || sns_stereo_mode[1] == SNS_STEREO_MODE_MS )

    {

        nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV;
@@ -519,6 +507,5 @@ int16_t quantize_sns( 
        }

    }





    return nbits;

}