Commit e5b7a256 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

allocate additional buffer channels for objects

parent ea250bf9

lib_dec/ivas_jbm_dec.c

+15 −1
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ ivas_error ivas_jbm_dec_feed_tc_to_renderer( 
    {

        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            ivas_ism_dec_digest_tc( st_ivas );

            //ivas_ism_dec_digest_tc( st_ivas );

            ivas_sba_dec_digest_tc( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );

        }

        else
@@ -1919,6 +1919,20 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
            }

        }

    }

#ifdef JBM_FOR_OSBA

	else if (st_ivas->ivas_format == SBA_ISM_FORMAT)

	{

            if ( st_ivas->sba_dirac_stereo_flag )

            {

                num_tc = CPE_CHANNELS;

            }

            if ( ( st_ivas->sba_planar && num_tc >= 3 ) || ( num_tc == 3 ) )

            {

                num_tc++;

            }

            num_tc += st_ivas->nchan_ism;

	}

#endif

    else if ( st_ivas->ivas_format == MC_FORMAT )

    {

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

lib_dec/ivas_spar_decoder.c

+6 −0
Original line number Diff line number Diff line
@@ -233,6 +233,12 @@ ivas_error ivas_spar_dec_open( 
        buffer_mode = TC_BUFFER_MODE_RENDERER;

        nchan_tc = ivas_jbm_dec_get_num_tc_channels( st_ivas );

        nchan_to_allocate = num_channels_internal;

#ifdef JBM_FOR_OSBA

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

        {

            nchan_to_allocate += st_ivas->nchan_ism;

	    }

#endif

        if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO )

        {

            buffer_mode = TC_BUFFER_MODE_BUFFER;