Commit ff70a9a8 authored by bayers's avatar bayers
Browse files

amend fix for SBA/OSBA RS

parent 81f4a149

lib_dec/ivas_init_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -356,8 +356,10 @@ 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

            /* 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



            num_bits_read += SBA_ORDER_BITS;

            if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->last_active_ivas_total_brate && ivas_total_brate > IVAS_SID_5k2 )
@@ -379,6 +381,10 @@ ivas_error ivas_dec_setup( 
            }

            else

            {

#ifdef FIX_XXX_SBA_RS

                /* 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

                ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init );

            }

        }

lib_dec/ivas_sba_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ 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

    int16_t sba_analysis_order_old;

#endif

#ifdef JBM_FOR_OSBA

    int16_t sba_analysis_order_old_flush;

#endif
@@ -142,8 +144,9 @@ 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

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



#endif

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

     * Set SBA high-level parameters

     * Save old SBA high-level parameters