Commit d5872b56 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 577-some-ism-modes-crash-in-instrumented-codec-build-but-not-in-normal-build
parents 35891d8d 159805f9

lib_dec/ivas_jbm_dec.c

+8 −16
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ ivas_error ivas_jbm_dec_tc( 
    int16_t n, output_frame, nchan_out;

    Decoder_State *st;                                /* used for bitstream handling */

    float output[MAX_TRANSPORT_CHANNELS][L_FRAME48k]; /* 'float' buffer for transport channels, MAX_TRANSPORT_CHANNELS channels */

    int16_t nchan_remapped, hodirac_flag;

    int16_t nchan_remapped;

    float output_lfe_ch[L_FRAME48k];

    int16_t nb_bits_metadata[MAX_SCE];

    int32_t output_Fs, ivas_total_brate;
@@ -95,7 +95,6 @@ ivas_error ivas_jbm_dec_tc( 
    nchan_out = st_ivas->hTcBuffer->nchan_transport_jbm;

    output_config = st_ivas->hDecoderConfig->output_config;

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;

    hodirac_flag = ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order );



    output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC );
@@ -188,16 +187,10 @@ ivas_error ivas_jbm_dec_tc( 
        set_s( nb_bits_metadata, 0, MAX_SCE );



        /* read parameters from the bitstream */

        if ( st_ivas->hQMetaData != NULL && st_ivas->ivas_format != SBA_FORMAT )

        if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hQMetaData != NULL )

        {

            st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];



            if ( st_ivas->ivas_format == SBA_FORMAT )

            {

                ivas_dirac_dec_read_BS( ivas_total_brate, st, st_ivas->hDirAC, st_ivas->hQMetaData, &nb_bits_metadata[0], hodirac_flag, 0 );

            }

            else

            {

            if ( ( error = ivas_masa_decode( st_ivas, st, &nb_bits_metadata[0] ) ) != IVAS_ERR_OK )

            {

                return error;
@@ -209,7 +202,6 @@ ivas_error ivas_jbm_dec_tc( 
            }

#endif

        }

        }

        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {