Commit 5273a518 authored by bayers's avatar bayers
Browse files

Merge branch 'FhG/5ms-api-continuation' of... 

Merge branch 'FhG/5ms-api-continuation' of forge.3gpp.org:ivas-codec-pc/ivas-codec into FhG/5ms-api-continuation
parents 041dac64 50305462

lib_dec/ivas_jbm_dec.c

+9 −3
Original line number Diff line number Diff line
@@ -1889,9 +1889,10 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
            {

                num_tc += st_ivas->nchan_ism;

            }

#ifdef UNIFY_CHANNEL_MEM_HEAP

            *nchan_transport_internal = num_tc;

            *nchan_transport_full = num_tc;

#ifdef UNIFY_CHANNEL_MEM_HEAP



            if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX )

            {

                num_tc = 1;
@@ -1905,11 +1906,13 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
            }

#endif

        }

#ifdef UNIFY_CHANNEL_MEM_HEAP

        else

        {

            *nchan_transport_internal = num_tc;

            *nchan_transport_full = num_tc;

        }

#endif

    }

    else if ( st_ivas->ivas_format == MC_FORMAT )

    {
@@ -1965,9 +1968,9 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
                /* LFE is synthesized in TD with the TCs*/

                num_tc++;

            }

#ifdef UNIFY_CHANNEL_MEM_HEAP

            *nchan_transport_internal = num_tc;

            *nchan_transport_full = num_tc;

#ifdef UNIFY_CHANNEL_MEM_HEAP

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_MONO )

            {

                num_tc = st_ivas->hDecoderConfig->nchan_out;
@@ -2332,6 +2335,7 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
#ifdef UNIFY_CHANNEL_MEM_HEAP

    if ( nchan_transport_jbm != hTcBuffer->nchan_transport_jbm || nchan_transport_internal != hTcBuffer->nchan_transport_internal || nchan_full != hTcBuffer->nchan_buffer_full || tc_buffer_mode != st_ivas->hTcBuffer->tc_buffer_mode || n_samples_granularity != st_ivas->hTcBuffer->n_samples_granularity )

    {

#endif

        hTcBuffer->tc_buffer_mode = tc_buffer_mode;

        hTcBuffer->nchan_transport_jbm = nchan_transport_jbm;

        hTcBuffer->nchan_transport_internal = nchan_transport_internal;
@@ -2343,7 +2347,7 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
        /* what is remaining from last frames needs always be smaller than n_samples_granularity */

        assert( ( hTcBuffer->n_samples_buffered - hTcBuffer->n_samples_rendered ) < n_samples_granularity );

#endif



#ifdef UNIFY_CHANNEL_MEM_HEAP

        if ( !st_ivas->hDecoderConfig->Opt_tsm )

        {

            /* we can directly use the already allocated in/out buffers */
@@ -2596,7 +2600,9 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode( 
            {

                buffer_mode = TC_BUFFER_MODE_RENDERER;

            }

#ifdef UNIFY_CHANNEL_MEM_HEAP

        }

#endif

        break;

        case RENDERER_SBA_LINEAR_ENC:

            if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT && ( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) && ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) >= ( st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe ) )