Commit cdc5ebe7 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

wrap changes into the new define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH

parent 598931b6

lib_dec/ivas_sba_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -305,11 +305,11 @@ ivas_error ivas_sba_dec_reconfigure( 
        }



        if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) ||

             ( ( last_ivas_total_brate >= IVAS_512k && ivas_total_brate < IVAS_512k ) ||

               ( last_ivas_total_brate < IVAS_512k && ivas_total_brate >= IVAS_512k ) ) ||

             ( ( ( last_ivas_total_brate >= IVAS_384k && ivas_total_brate < IVAS_384k ) ||

                 ( last_ivas_total_brate < IVAS_384k && ivas_total_brate >= IVAS_384k ) ) &&

               st_ivas->ivas_format == SBA_ISM_FORMAT ) )

             ( ( last_ivas_total_brate >= IVAS_512k && ivas_total_brate < IVAS_512k ) || ( last_ivas_total_brate < IVAS_512k && ivas_total_brate >= IVAS_512k ) )

#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH

             || ( ( ( last_ivas_total_brate >= IVAS_384k && ivas_total_brate < IVAS_384k ) || ( last_ivas_total_brate < IVAS_384k && ivas_total_brate >= IVAS_384k ) ) && st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

        )

        {

            ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 1 );

lib_enc/ivas_osba_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -299,8 +299,10 @@ ivas_error ivas_osba_enc_reconfig( 
            hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;

        }

        if ( nchan_transport_old != st_ivas->nchan_transport ||

#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH

             ( ivas_total_brate < IVAS_384k && hEncoderConfig->last_ivas_total_brate >= IVAS_384k ) ||

             ( ivas_total_brate >= IVAS_384k && hEncoderConfig->last_ivas_total_brate < IVAS_384k ) ||

#endif

             ( ivas_total_brate < IVAS_512k && hEncoderConfig->last_ivas_total_brate >= IVAS_512k ) ||

             ( ivas_total_brate >= IVAS_512k && hEncoderConfig->last_ivas_total_brate < IVAS_512k ) )

        {