Commit 08924bdb authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '47-fix-the-error-reporting-when-agc-is-enabled' into 'main' 

fir for IVAS-047, Fix the error reporting when AGC is enabled

See merge request !32
parents 7d9cbb7e f5ff78e1

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ 


#define FIX_038_TV_FIX_DEC_CRASH_DURING_FEC             /* IVAS-038 Fixed potential decoder crash on frame lost, due to loss of synchronisation between encoder and decoder */



#define FIX_047_ERROR_ENABLING_AGC                      /* IVAS-047, Fix the error reporting when AGC is enabled*/



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_enc/lib_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -762,8 +762,12 @@ static ivas_error configureEncoder( 
                /* IVAS_fmToDo: needs more work in case of bitrate switching */

                hEncoderConfig->sba_order = 1;

            }

#ifndef FIX_047_ERROR_ENABLING_AGC

#ifndef SBA_CLEANING

            st_ivas->sba_mode = ivas_sba_mode_select( hEncoderConfig->ivas_total_brate ); // VE: is it needed here?

#endif

#else

            st_ivas->sba_mode = ivas_sba_mode_select( hEncoderConfig->ivas_total_brate );

#endif

        }

        else if ( hEncoderConfig->ivas_format == MASA_FORMAT )