Commit dd1e1a69 authored by eichenseer's avatar eichenseer
Browse files

Fix merge mistake in ivas_ism_enc.c; manually fix new audio config names in ivas_ism_param_dec.c.

parent d42d1da6

lib_dec/ivas_ism_param_dec.c

+18 −18
Original line number Diff line number Diff line
@@ -1965,9 +1965,9 @@ static ivas_error ivas_param_ism_rendering_init( 
    }



#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

    if ( !( output_config == AUDIO_CONFIG_EXTERNAL || output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

    if ( !( output_config == IVAS_AUDIO_CONFIG_EXTERNAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#else

    if ( !( output_config == AUDIO_CONFIG_EXTERNAL || output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    if ( !( output_config == IVAS_AUDIO_CONFIG_EXTERNAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

    {

        /* computation of proto matrix */
@@ -2093,7 +2093,7 @@ ivas_error ivas_param_ism_dec_open( 
     *-----------------------------------------------------------------*/



    /* hIntSetup and hOutSetup differs only for Binaural rendering */

    if ( output_config == AUDIO_CONFIG_EXTERNAL )

    if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

    {

        /* nchan_out is essential for memory initialization for CLDFB Synthesis */

        st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->nchan_ism;
@@ -2102,7 +2102,7 @@ ivas_error ivas_param_ism_dec_open( 


    hOutSetup = st_ivas->hIntSetup;



    if ( !( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) )

    if ( !( output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO ) )

    {

        /* Initialize Param ISM Rendering handle */

        if ( st_ivas->hDecoderConfig->Opt_tsm )
@@ -2122,11 +2122,11 @@ ivas_error ivas_param_ism_dec_open( 
    }



#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

    if ( !( output_config == AUDIO_CONFIG_EXTERNAL || output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB ||

            output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

    if ( !( output_config == IVAS_AUDIO_CONFIG_EXTERNAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ||

            output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#else

    if ( !( output_config == AUDIO_CONFIG_EXTERNAL || output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB ||

            output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) )

    if ( !( output_config == IVAS_AUDIO_CONFIG_EXTERNAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ||

            output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO ) )

#endif

    {

        /* Initialize efap handle */
@@ -2145,9 +2145,9 @@ ivas_error ivas_param_ism_dec_open( 
    hSpatParamRendCom->dirac_read_idx = 0;



#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

    if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

    if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

    {

        if ( ( error = ivas_dirac_allocate_parameters( hSpatParamRendCom, 1 ) ) != IVAS_ERR_OK )
@@ -2259,7 +2259,7 @@ void ivas_param_ism_dec_close( 
            hParamIsmDec->hParamIsm = NULL;

        }



        if ( !( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) )

        if ( !( output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO ) )

        {

            /* Param ISM Rendering */

            if ( hParamIsmDec->hParamIsmRendering->interpolator != NULL )
@@ -2297,7 +2297,7 @@ void ivas_param_ism_dec_close( 


    if ( hSpatParamRendCom_out != NULL && *hSpatParamRendCom_out != NULL )

    {

        if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            ivas_dirac_deallocate_parameters( *hSpatParamRendCom_out, 1 );

            ivas_dirac_deallocate_parameters( *hSpatParamRendCom_out, 2 );
@@ -2360,7 +2360,7 @@ void ivas_param_ism_dec( 
    output_frame = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC );



    nchan_transport = st_ivas->nchan_transport;

    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

    {

        nchan_out = st_ivas->nchan_ism;

        nchan_out_woLFE = nchan_out;
@@ -2399,7 +2399,7 @@ void ivas_param_ism_dec( 
    }



    /* obtain the direct response using EFAP */

    if ( !( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) )

    if ( !( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL ) )

    {

        for ( i = 0; i < st_ivas->nchan_ism; i++ )

        {
@@ -2608,7 +2608,7 @@ void ivas_ism_dec_digest_tc( 
        {

            mvr2r( st_ivas->hIsmRendererData->gains[i], st_ivas->hIsmRendererData->prev_gains[i], MAX_OUTPUT_CHANNELS );



            if ( st_ivas->intern_config == AUDIO_CONFIG_STEREO )

            if ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_STEREO )

            {

                ivas_ism_get_stereo_gains( st_ivas->hIsmMetaData[i]->azimuth,

                                           st_ivas->hIsmMetaData[i]->elevation,
@@ -2683,7 +2683,7 @@ void ivas_param_ism_dec_digest_tc( 
    nchan_transport = st_ivas->nchan_transport;

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;



    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

    {

        nchan_out = st_ivas->nchan_ism;

        nchan_out_woLFE = nchan_out;
@@ -2723,7 +2723,7 @@ void ivas_param_ism_dec_digest_tc( 
    }



    /* obtain the direct response using EFAP */

    if ( !( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) )

    if ( !( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL ) )

    {

        for ( i = 0; i < st_ivas->nchan_ism; i++ )

        {
@@ -3000,7 +3000,7 @@ void ivas_param_ism_dec_render( 
    assert( hSpatParamRendCom );

#endif

    nchan_transport = st_ivas->nchan_transport;

    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

    {

        nchan_out = st_ivas->nchan_ism;

        nchan_out_woLFE = nchan_out;

lib_enc/ivas_ism_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ ivas_error ivas_ism_enc( 
                                              nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag, -1, 0, NULL, st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_ism_metadata_enc( &st_ivas->hEncoderConfig->ivas_total_brate, nchan_ism, nchan_transport_ism, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData,

                                              nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hParamIsmDec->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag, -1, 0, NULL, st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame ) ) != IVAS_ERR_OK )

                                              nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag, -1, 0, NULL, st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame ) ) != IVAS_ERR_OK )

#endif

        {

            return error;