Commit 1767dc6f authored by vaclav's avatar vaclav
Browse files

introduce define SBA_MIN_BRATE_HOA

parent 33436935

lib_com/bitstream.c

+2 −2
Original line number Diff line number Diff line
@@ -1987,8 +1987,8 @@ ivas_error preview_indices( 
            st_ivas->sba_analysis_order = st_ivas->hDecoderConfig->sba_order;

#endif

#ifdef SBA_ORDER_BITSTREAM

            /*Hard coding the the sba_oder as 1 as higher not supported below 256k bitrate*/

            if ( total_brate < IVAS_256k )

            /*Hard coding the sba_order as 1 as higher not supported below SBA_MIN_BRATE_HOA bitrate*/

            if ( total_brate < SBA_MIN_BRATE_HOA )

            {

                st_ivas->sba_analysis_order = 1;

            }

lib_com/ivas_cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ typedef enum { 


#define SBA_PLANAR_BITS                         1

#define SBA_ORDER_BITS                          2

#define SBA_MIN_BRATE_HOA                       IVAS_256k

#define SBA_NHARM_HOA3                          16

#define SBA_T_DESIGN_11_SIZE                    70

lib_dec/ivas_init_dec.c

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

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

            st_ivas->sba_analysis_order = st_ivas->hDecoderConfig->sba_order;

            if ( ivas_total_brate < IVAS_256k )

            

            if ( ivas_total_brate < SBA_MIN_BRATE_HOA )

            {

                st_ivas->sba_analysis_order = 1;

            }

lib_enc/lib_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -772,9 +772,9 @@ static ivas_error configureEncoder( 
        }

        else if ( hEncoderConfig->ivas_format == SBA_FORMAT )

        {

            if ( hEncoderConfig->ivas_total_brate < IVAS_256k )

            if ( hEncoderConfig->ivas_total_brate < SBA_MIN_BRATE_HOA )

            {

                /* set SBA order to 1 for bit rates below 256kbps for correct handling of input with higher order */

                /* set SBA order to 1 for bit rates below SBA_MIN_BRATE_HOA for correct handling of input with higher order */

                /* IVAS_fmToDo: needs more work in case of bitrate switching */

#ifndef SBA_ORDER_BITSTREAM

                hEncoderConfig->sba_order = 1;