Commit 28eafb0b authored by vaclav's avatar vaclav
Browse files

revert a removal

parent 22e41ec6

lib_dec/ivas_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -494,6 +494,8 @@ ivas_error ivas_dec( 
        /* Configuration of combined-format bit-budget distribution */

        ivas_set_surplus_brate_dec( st_ivas, &ism_total_brate );



        st_ivas->hCPE[0]->hCoreCoder[0]->bit_stream = &( st_ivas->bit_stream[( ism_total_brate / FRAMES_PER_SEC )] );



        /* set ISM parameters and decode ISM metadata in OMASA format */

        if ( ( error = ivas_omasa_ism_metadata_dec( st_ivas, ism_total_brate, &nchan_ism, &nchan_transport_ism, dirac_bs_md_write_idx, &nb_bits_metadata[1] ) ) != IVAS_ERR_OK )

        {

lib_dec/ivas_jbm_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ ivas_error ivas_jbm_dec_tc( 
        int16_t nchan_ism, nchan_transport_ism;

        int16_t dirac_bs_md_write_idx;



        st = st_ivas->hCPE[0]->hCoreCoder[0];

        set_s( nb_bits_metadata, 0, MAX_SCE + 1 );



        /* Set the number of objects for the parametric rendering */
@@ -338,7 +337,7 @@ ivas_error ivas_jbm_dec_tc( 
        }



        /* MASA metadata decoding */

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

        if ( ( error = ivas_masa_decode( st_ivas, st_ivas->hCPE[0]->hCoreCoder[0], &nb_bits_metadata[0] ) ) != IVAS_ERR_OK )

        {

            return error;

        }
@@ -346,6 +345,8 @@ ivas_error ivas_jbm_dec_tc( 
        /* Configuration of combined-format bit-budget distribution */

        ivas_set_surplus_brate_dec( st_ivas, &ism_total_brate );



        st_ivas->hCPE[0]->hCoreCoder[0]->bit_stream = &( st_ivas->bit_stream[( ism_total_brate / FRAMES_PER_SEC )] );



        /* set ISM parameters and decode ISM metadata in OMASA format */

        if ( ( error = ivas_omasa_ism_metadata_dec( st_ivas, ism_total_brate, &nchan_ism, &nchan_transport_ism, dirac_bs_md_write_idx, &nb_bits_metadata[1] ) ) != IVAS_ERR_OK )

        {