Commit 2c21b46c authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch... 

Merge branch '908-decoder-crash-in-osba-foa-with-br-switching-due-to-bit-error-detection' into 'main'

Resolve "Decoder crash in OSBA (FOA) with BR switching due to bit error detection"

See merge request !1257
parents 513567bb d53ff9c9

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ 
#define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION               /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */

#define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

#define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 908: fix crash in OSBA BR switching with long test vectors */



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

lib_dec/ivas_sba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -325,7 +325,11 @@ ivas_error ivas_sba_dec_reconfigure( 
            }

        }



#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH

        if ( hSpar->hPCA == NULL && st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 && ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) )

#else

        if ( hSpar->hPCA == NULL && st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 && st_ivas->ivas_format == SBA_FORMAT )

#endif

        {

            if ( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL )

            {

lib_enc/lib_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -990,7 +990,11 @@ static ivas_error configureEncoder( 
    }

#endif



#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH

    if ( hEncoderConfig->Opt_PCA_ON && !( ( hEncoderConfig->ivas_format == SBA_FORMAT || hEncoderConfig->ivas_format == SBA_ISM_FORMAT ) && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) )

#else

    if ( hEncoderConfig->Opt_PCA_ON && !( hEncoderConfig->ivas_format == SBA_FORMAT && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) )

#endif

    {

        return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "PCA supported at SBA FOA 256 kbps only." );

    }