Commit 26c93190 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix audio config names in new OSBA JBM code

parent 42af1165

lib_dec/ivas_jbm_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ ivas_error ivas_jbm_dec_feed_tc_to_renderer( 
                 st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ||

                 st_ivas->renderer_type == RENDERER_OSBA_AMBI ||

                 st_ivas->renderer_type == RENDERER_OSBA_LS ||

                 st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

                 st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

            {

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

                {
@@ -1239,7 +1239,7 @@ ivas_error ivas_jbm_dec_render( 
                    v_multc( p_output[n], 0.5f, p_output[n], *nSamplesRendered );

                }

            }

            else if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) /*EXT output = individual objects + HOA3*/

            else if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL ) /*EXT output = individual objects + HOA3*/

            {



                ivas_sba_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, &p_output[st_ivas->nchan_ism] );
@@ -1261,7 +1261,7 @@ ivas_error ivas_jbm_dec_render( 
        else /* SBA_MODE_SPAR */

        {

            ivas_sba_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

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

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

            {

#ifdef DEBUGGING

                assert( st_ivas->ism_mode == ISM_MODE_NONE );

lib_dec/ivas_output_config.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ void ivas_renderer_select( 
#ifdef OSBA_ROOM_IR

            if ( st_ivas->ivas_format == SBA_ISM_FORMAT && *renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

            {

                *internal_config = AUDIO_CONFIG_7_1_4;

                *internal_config = IVAS_AUDIO_CONFIG_7_1_4;

            }

#endif

lib_dec/ivas_sba_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ ivas_error ivas_sba_dec_reconfigure( 
    granularity_new = st_ivas->hTcBuffer->n_samples_granularity;



    /* we may need to flush only for binaural and OSBA and TSM */

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {

        RENDERER_TYPE renderer_type_new;

        int16_t sba_order_internal;
@@ -193,7 +193,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        if ( ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) <= 2 )

        {



            if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL

#ifdef SPLIT_REND_WITH_HEAD_ROT

                 || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM

#endif
@@ -208,7 +208,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        }

        else

        {

            if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#ifdef SPLIT_REND_WITH_HEAD_ROT

                 || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM

#endif
@@ -662,7 +662,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_MONO )

        {

#ifdef JBM_FOR_OSBA

            if ( ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )

            if ( ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO ) )

            {

                tc_nchan_tc = st_ivas->hDecoderConfig->nchan_out + st_ivas->nchan_ism;

                tc_nchan_to_allocate = tc_nchan_tc;