Commit 19ceea64 authored by fotopoulou's avatar fotopoulou
Browse files

fix for 3 object case

parent 9562e705

lib_dec/ivas_init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ ivas_error ivas_dec_setup( 
            /*correct number of CPEs for discrete ISM coding*/

            if ( st_ivas->ini_frame > 0 && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

            {

                st_ivas->nCPE += st_ivas->nchan_ism >> 1;

                st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1;

            }



            st_ivas->ism_mode = ISM_SBA_MODE_DISC;
@@ -1101,7 +1101,7 @@ ivas_error ivas_init_decoder( 


        int32_t temp_brate[MAX_SCE];



        st_ivas->nCPE += st_ivas->nchan_ism >> 1;

        st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1;





        st_ivas->element_mode_init = IVAS_CPE_MDCT;

lib_enc/ivas_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ ivas_error ivas_enc( 
#endif

#endif

#ifdef ENABLE_ISM_MD_CODING

            if ( ( error = ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, n, st_ivas->nchan_transport, st_ivas->hIsmMetaData, NULL, hMetaData, &nb_bits_metadata[1], 0, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag

            if ( ( error = ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, n, st_ivas->hEncoderConfig->nchan_ism, st_ivas->hIsmMetaData, NULL, hMetaData, &nb_bits_metadata[1], 0, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag

#ifdef OSBA_DISC_OBJ_MCT

                                                  ,

                                                  st->ini_frame

lib_enc/ivas_init_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ ivas_error ivas_init_encoder( 
        {

            /* allocate and initialize MCT core coder */



            st_ivas->nCPE += st_ivas->hEncoderConfig->nchan_ism >> 1;

            st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1;



            for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )

            {