Commit d422c33c authored by reutelhuber's avatar reutelhuber
Browse files

rename binauralization function for OSBA to avoid duplicated file name

parent c15e5b09

lib_com/ivas_prot.h

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -5676,7 +5676,7 @@ ivas_error ivas_masa_ism_separate_object_renderer_open( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */

);



ivas_error ivas_omasa_dirac_td_binaural(

ivas_error ivas_osba_dirac_td_binaural(

    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder structure          */

    float output[][L_FRAME48k], /* o  : output synthesis signal         */

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

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ ivas_error ivas_dec( 


        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

        {

            if ( ( error = ivas_omasa_dirac_td_binaural( st_ivas, output, output_frame ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_osba_dirac_td_binaural( st_ivas, output, output_frame ) ) != IVAS_ERR_OK )

            {

                return error;

            }

lib_dec/ivas_osba_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -173,12 +173,12 @@ ivas_error ivas_masa_ism_separate_object_renderer_open( 




/*--------------------------------------------------------------------------*

 * ivas_omasa_dirac_td_binaural()

 * ivas_osba_dirac_td_binaural()

 *

 * Binaural rendering in OMASA format

 *--------------------------------------------------------------------------*/



ivas_error ivas_omasa_dirac_td_binaural(

ivas_error ivas_osba_dirac_td_binaural(

    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder structure          */

    float output[][L_FRAME48k], /* o  : output synthesis signal         */

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

lib_enc/ivas_enc.c

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,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->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,-1,0,NULL

            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,-1,0,NULL

#ifdef OSBA_DISC_OBJ_MCT

                               ,

                               st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame