Commit c582f308 authored by vaclav's avatar vaclav
Browse files

simplification

parent 183958b6

lib_dec/ivas_init_dec.c

+3 −14
Original line number Diff line number Diff line
@@ -2126,18 +2126,16 @@ ivas_error ivas_init_decoder( 
                return error;

            }

        }

#ifndef NONBE_1303_REND_GRANULARITY



#ifdef NONBE_1303_REND_GRANULARITY

        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );

#else

        granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );

#endif

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );



        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#endif

    }

    else if ( st_ivas->renderer_type == RENDERER_MC )

    {
@@ -2170,16 +2168,7 @@ ivas_error ivas_init_decoder( 
        }



        st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;



#ifdef NONBE_1303_REND_GRANULARITY

        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );



        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#else

#ifndef NONBE_1303_REND_GRANULARITY



        if ( ( st_ivas->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) )

        {