Commit 41bdcfbb authored by SCHUGM's avatar SCHUGM
Browse files

small changes to let the decoder run with -vs command line (without meaningful... 

small changes to let the decoder run with -vs command line (without meaningful output): increased tc buffer channels to 12, disabled full
ivas_mc_paramumix_dec function for jbm
parent 588c8b29

lib_dec/ivas_jbm_dec.c

+7 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ ivas_error ivas_jbm_dec_tc( 


            mvr2r( output_lfe_ch, output[LFE_CHANNEL], output_frame );



            ivas_mc_paramupmix_dec( st_ivas, output );

            //ivas_mc_paramupmix_dec( st_ivas, output );



            /* HP filtering */

            for ( n = 0; n < st_ivas->nchan_transport; n++ )
@@ -919,6 +919,12 @@ ivas_error ivas_jbm_dec_render( 
                ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, st_ivas->hTcBuffer->tc, p_output );

            }

        }

#ifdef JBM_PARAMUPMIX

        else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

        {

            *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

        }

#endif

        else if ( st_ivas->mc_mode == MC_MODE_PARAMMC )

        {

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

lib_dec/ivas_mc_paramupmix_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ ivas_error ivas_mc_paramupmix_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;

        nchan_to_allocate = nchan_tc;

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

        {

            buffer_mode = TC_BUFFER_MODE_BUFFER;