Commit 7a912511 authored by sagnowski's avatar sagnowski
Browse files

Fix leftover preprocessor switches in unit test

parent 81750fdb
Loading
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ the United Nations Convention on Contracts on the International Sales of Goods.
#include "isar_lc3plus_common.h"
#include "isar_lc3plus_dec.h"
#include "ivas_error_utils.h"
#ifdef LC3PLUS_VBR
#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
#include "lc3.h"
#endif

@@ -222,12 +222,12 @@ static int tryOpenEncoderWithInvalidBitrate( void )
    /* lc3plus max bitrate is 320000 per channel */
    uint32_t invalid_high_bps = 700000;
    uint32_t invalid_low_bps = 8;
#ifdef LC3PLUS_VBR
#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
    uint32_t limitedBitrate;
#endif
    ISAR_LC3PLUS_ENC_HANDLE encHandle;
    err = ISAR_LC3PLUS_ENC_Open( config, invalid_high_bps, &encHandle );
#ifdef LC3PLUS_VBR
#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
    /* setting an invalid bitrate should result in a limited bitrate*/
    if ( IVAS_ERR_OK != err )
#else
@@ -237,7 +237,7 @@ static int tryOpenEncoderWithInvalidBitrate( void )
    {
        return 1;
    }
#ifdef LC3PLUS_VBR
#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
    limitedBitrate = lc3plus_enc_get_real_bitrate(encHandle->handles[0]);
    if(limitedBitrate != 320000)
    {
@@ -694,7 +694,7 @@ static int encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_124kbpsPerChannel
    return encodeAndDecodeOneStereoFrame( config, config.channels * 126*1000 );
}

#ifdef LC3PLUS_VBR
#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
static int encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_800kbpsPerChannel( void )
{
#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
@@ -826,7 +826,7 @@ int main(
    ret = encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_124kbpsPerChannel();
    if ( ret != 0 )
        return 1;
#ifdef LC3PLUS_VBR
#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
    ret = encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_800kbpsPerChannel();
    if ( ret != 0 )
        return 1;