Commit 8a41c3f5 authored by bayers's avatar bayers
Browse files

fix compile errors in the JBM path

parent 93c509a4

lib_dec/ivas_jbm_dec.c

+21 −1
Original line number Diff line number Diff line
@@ -131,7 +131,11 @@ ivas_error ivas_jbm_dec_tc( 
        }

        if ( st_ivas->renderer_type == RENDERER_MC && st_ivas->hDecoderConfig->nchan_out == 1 )

        {

#ifdef MC_PARAMUPMIX_MODE

            ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output );

#else

            ivas_ls_setup_conversion( st_ivas, output_frame, p_output, p_output );

#endif

        }

    }

    else if ( st_ivas->ivas_format == ISM_FORMAT )
@@ -363,7 +367,11 @@ ivas_error ivas_jbm_dec_tc( 
            {

                if ( st_ivas->renderer_type == RENDERER_MC )

                {

#ifdef MC_PARAMUPMIX_MODE

                    ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output );

#else

                    ivas_ls_setup_conversion( st_ivas, output_frame, p_output, p_output );

#endif

                }

                else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

                {
@@ -400,7 +408,11 @@ ivas_error ivas_jbm_dec_tc( 
            /* Rendering */

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

            {

#ifdef MC_PARAMUPMIX_MODE

                ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output );

#else

                ivas_ls_setup_conversion( st_ivas, output_frame, p_output, p_output );

#endif

            }

        }

        else if ( st_ivas->mc_mode == MC_MODE_MCMASA )
@@ -674,7 +686,11 @@ ivas_error ivas_jbm_dec_render( 
        if ( st_ivas->renderer_type == RENDERER_MC )

        {

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

            ivas_ls_setup_conversion( st_ivas, *nSamplesRendered, p_tc, p_output );

#ifdef MC_PARAMUPMIX_MODE

            ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, *nSamplesRendered, p_tc, p_output );

#else

            ivas_ls_setup_conversion( st_ivas, output_frame, p_output, p_output );

#endif

        }

    }

    else if ( st_ivas->ivas_format == ISM_FORMAT )
@@ -806,7 +822,11 @@ ivas_error ivas_jbm_dec_render( 
            else if ( st_ivas->renderer_type == RENDERER_MC )

            {

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

#ifdef MC_PARAMUPMIX_MODE

                ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, *nSamplesRendered, p_tc, p_output );

#else

                ivas_ls_setup_conversion( st_ivas, *nSamplesRendered, p_tc, p_output );

#endif

            }

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

            {