Commit 2bde0d68 authored by bayers's avatar bayers
Browse files

integrate sub define into NONBE_UNIFIED_DECODING_PATHS

parent 17b947f5

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -188,9 +188,7 @@ 


#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

#ifdef NONBE_UNIFIED_DECODING_PATHS

#define REMOVE_5MS_FLAG

/*#define UNIFY_CHANNEL_MEM_HEAP*/

#define FIX_XXX_SBA_RS

#endif



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ ivas_error ivas_dec_setup( 
            st_ivas->sba_order = st_ivas->bit_stream[num_bits_read + 1];

            st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read];



#ifndef FIX_XXX_SBA_RS

#ifndef NONBE_UNIFIED_DECODING_PATHS

            /* set Ambisonic (SBA) order used for analysis and coding */

            st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->sba_order );

#endif
@@ -381,7 +381,7 @@ ivas_error ivas_dec_setup( 
            }

            else

            {

#ifdef FIX_XXX_SBA_RS

#ifdef NONBE_UNIFIED_DECODING_PATHS

                /* set Ambisonic (SBA) order used for analysis and coding */

                st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->sba_order );

#endif

lib_dec/ivas_sba_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ ivas_error ivas_sba_dec_reconfigure( 
    int32_t last_ivas_total_brate;

    int16_t num_channels, num_md_sub_frames;

    int16_t ch, nchan_out_buff, nchan_out_buff_old;

#ifndef FIX_XXX_SBA_RS

#ifndef NONBE_UNIFIED_DECODING_PATHS

    int16_t sba_analysis_order_old;

#endif

#ifdef JBM_FOR_OSBA
@@ -144,7 +144,7 @@ ivas_error ivas_sba_dec_reconfigure( 
#ifdef JBM_FOR_OSBA

    sba_analysis_order_old_flush = st_ivas->sba_analysis_order;

#endif

#ifndef FIX_XXX_SBA_RS

#ifndef NONBE_UNIFIED_DECODING_PATHS

    sba_analysis_order_old = ivas_sba_get_analysis_order( last_ivas_total_brate, st_ivas->sba_order );

#endif

    /*-----------------------------------------------------------------*
@@ -152,13 +152,13 @@ ivas_error ivas_sba_dec_reconfigure( 
     * Save old SBA high-level parameters

     *-----------------------------------------------------------------*/

#ifdef UNIFY_CHANNEL_MEM_HEAP

#ifdef FIX_XXX_SBA_RS

#ifdef NONBE_UNIFIED_DECODING_PATHS

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, sba_analysis_order_old_flush, last_ivas_total_brate, st_ivas->hTcBuffer->nchan_buffer_full );

#else

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, sba_analysis_order_old, last_ivas_total_brate, st_ivas->hTcBuffer->nchan_buffer_full );

#endif

#else

#ifdef FIX_XXX_SBA_RS

#ifdef NONBE_UNIFIED_DECODING_PATHS

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, sba_analysis_order_old_flush, last_ivas_total_brate );

#else

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, sba_analysis_order_old, last_ivas_total_brate );