Commit 549a18dc authored by vaclav's avatar vaclav
Browse files

build fixes

parent 3514191e

lib_isar/isar_lc3plus_dec.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "lc3.h"

#include "ivas_error.h"

#include "ivas_cnst.h"

#include "isar_lc3plus_common.h"

lib_isar/isar_rom_lcld_tables.h

+3 −3
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 


*******************************************************************************************************/



#ifndef _ISAR_ROM_LCLD_TABLES_H_

#define _ISAR_ROM_LCLD_TABLES_H_

#ifndef ISAR_ROM_LCLD_TABLES_H

#define ISAR_ROM_LCLD_TABLES_H



#include <stdint.h>

#include "options.h"
@@ -194,4 +194,4 @@ extern const uint32_t c_aaiRMSEnvHuffEnc[64][2]; 
extern const uint32_t c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE];

#endif /*SPLIT_REND_WITH_HEAD_ROT*/



#endif /* _TABLES_H_ */
 
#endif /* ISAR_ROM_LCLD_TABLES_H_ */

scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c

+41 −41
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ static int encodeAndDecodeOneStereoFrame( LC3PLUS_CONFIG config ) 
    int32_t decDelay = -1;



    ISAR_LC3PLUS_ENC_HANDLE encHandle;

    err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle );

    err = ISAR_LC3PLUS_ENC_Open( config, bps, &encHandle );

    if ( IVAS_ERR_OK != err )

    {

        return err;

    }



    err = IVAS_LC3PLUS_ENC_GetDelay( encHandle, &encDelay );

    err = ISAR_LC3PLUS_ENC_GetDelay( encHandle, &encDelay );

    if ( IVAS_ERR_OK != err )

    {

        return err;
@@ -77,21 +77,21 @@ static int encodeAndDecodeOneStereoFrame( LC3PLUS_CONFIG config ) 
    pcm_in[1] = pcm_in_ch2;



    int32_t bitstreamSizePerIvasFrame = 0;

    err = IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame );

    err = ISAR_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame );

    if ( IVAS_ERR_OK != err )

        return err;



    uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame );

    memset( bitstream_out, 0, bitstreamSizePerIvasFrame );



    err = IVAS_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out );

    err = ISAR_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out );

    if ( IVAS_ERR_OK != err )

        return err;

    IVAS_LC3PLUS_ENC_Close( &encHandle );

    ISAR_LC3PLUS_ENC_Close( &encHandle );



    /* decode one frame */

    ISAR_LC3PLUS_DEC_HANDLE decHandle;

    err = IVAS_LC3PLUS_DEC_Open( config,

    err = ISAR_LC3PLUS_DEC_Open( config,

#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING

                                 1 /*caching enabled*/,

#endif
@@ -101,7 +101,7 @@ static int encodeAndDecodeOneStereoFrame( LC3PLUS_CONFIG config ) 
        return err;

    }



    err = IVAS_LC3PLUS_DEC_GetDelay( decHandle, &decDelay );

    err = ISAR_LC3PLUS_DEC_GetDelay( decHandle, &decDelay );

    if ( IVAS_ERR_OK != err )

    {

        return err;
@@ -121,25 +121,25 @@ static int encodeAndDecodeOneStereoFrame( LC3PLUS_CONFIG config ) 
    pcm_out[0] = pcm_out_ch1;

    pcm_out[1] = pcm_out_ch2;



    err = IVAS_LC3PLUS_DEC_Conceal( decHandle, pcm_out );

    err = ISAR_LC3PLUS_DEC_Conceal( decHandle, pcm_out );

    if ( IVAS_ERR_OK != err )

    {

        return err;

    }



    err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out );

    err = ISAR_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out );

    if ( IVAS_ERR_OK != err )

    {

        return err;

    }



    err = IVAS_LC3PLUS_DEC_Conceal( decHandle, pcm_out );

    err = ISAR_LC3PLUS_DEC_Conceal( decHandle, pcm_out );

    if ( IVAS_ERR_OK != err )

    {

        return err;

    }



    IVAS_LC3PLUS_DEC_Close( &decHandle );

    ISAR_LC3PLUS_DEC_Close( &decHandle );

    free( bitstream_out );



    return 0;
@@ -153,13 +153,13 @@ static int openCloseEncoder( void ) 
    uint32_t bps = 128000;



    ISAR_LC3PLUS_ENC_HANDLE encHandle;

    err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle );

    err = ISAR_LC3PLUS_ENC_Open( config, bps, &encHandle );

    if ( IVAS_ERR_OK != err )

    {

        return err;

    }



    IVAS_LC3PLUS_ENC_Close( &encHandle );

    ISAR_LC3PLUS_ENC_Close( &encHandle );

    return 0;

}
@@ -172,7 +172,7 @@ static int tryOpenEncoderWithInvalidBitrate( void ) 
    uint32_t invalid_low_bps = 8;



    ISAR_LC3PLUS_ENC_HANDLE encHandle;

    err = IVAS_LC3PLUS_ENC_Open( config, invalid_high_bps, &encHandle );

    err = ISAR_LC3PLUS_ENC_Open( config, invalid_high_bps, &encHandle );

    /* setting an invalid bitrate should trigger an error - which is what we expect */

    if ( IVAS_ERR_LC3PLUS_INVALID_BITRATE != err )

    {
@@ -195,7 +195,7 @@ static int tryOpenEncoderWithInvalidFrameDuration( void ) 
    uint32_t bps = 320000;



    ISAR_LC3PLUS_ENC_HANDLE encHandle;

    err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle );

    err = ISAR_LC3PLUS_ENC_Open( config, bps, &encHandle );

    /* setting an invalid fame duration should trigger an error - which is what we expect */

    if ( IVAS_ERR_OK == err )

    {
@@ -212,7 +212,7 @@ static int tryOpenEncoderWithInvalidSampleRate( void ) 
    uint32_t bps = 320000;



    ISAR_LC3PLUS_ENC_HANDLE encHandle;

    err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle );

    err = ISAR_LC3PLUS_ENC_Open( config, bps, &encHandle );

    /* setting an invalid sample rate should trigger an error - which is what we expect */

    if ( IVAS_ERR_OK == err )

    {
@@ -238,11 +238,11 @@ static int tryCallEncoderApiWithInvalidParams( void ) 
    pcm_in[0] = pcm_in_ch1;

    uint8_t bitstream_out[1200];



    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetDelay( invalidEncHandle, invalidDelayInSamples ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetDelay( invalidEncHandle, &delayInSamples ) )

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_GetDelay( invalidEncHandle, invalidDelayInSamples ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_GetDelay( invalidEncHandle, &delayInSamples ) )

    {

        return 1;

    }

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( invalidEncHandle, invalidBsSize ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( invalidEncHandle, &bsSize ) )

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_GetOutputBitstreamSize( invalidEncHandle, invalidBsSize ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_GetOutputBitstreamSize( invalidEncHandle, &bsSize ) )

    {

        return 1;

    }
@@ -251,7 +251,7 @@ static int tryCallEncoderApiWithInvalidParams( void ) 
    {

        return 1;

    }

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, invalidBitstream_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode( invalidEncHandle, invalidPcm_in, bitstream_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, bitstream_out ) )

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, invalidBitstream_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, invalidPcm_in, bitstream_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, bitstream_out ) )

    {

        return 1;

    }
@@ -277,17 +277,17 @@ static int tryCallDecoderApiWithInvalidParams( void ) 
    pcm_out[0] = pcm_out_ch1;

    uint8_t bitstream_in[1200];



    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_GetDelay( invalidDecHandle, invalidDelayInSamples ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_GetDelay( invalidDecHandle, &delayInSamples ) )

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_GetDelay( invalidDecHandle, invalidDelayInSamples ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_GetDelay( invalidDecHandle, &delayInSamples ) )

    {

        return 1;

    }

    IVAS_LC3PLUS_DEC_Close( &invalidDecHandle );

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, invalidBitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, invalidBitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, bitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, bitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, invalidBitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, invalidBitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, bitstream_in_size, pcm_out ) )

    ISAR_LC3PLUS_DEC_Close( &invalidDecHandle );

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, invalidBitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, invalidBitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, bitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, bitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, invalidBitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, invalidBitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, bitstream_in_size, pcm_out ) )

    {

        return 1;

    }



    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Conceal( invalidDecHandle, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Conceal( invalidDecHandle, pcm_out ) )

    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Conceal( invalidDecHandle, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_DEC_Conceal( invalidDecHandle, pcm_out ) )

    {

        return 1;

    }
@@ -300,7 +300,7 @@ static int openCloseDecoderWithCaching( void ) 
    LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 };



    ISAR_LC3PLUS_DEC_HANDLE decHandle;

    err = IVAS_LC3PLUS_DEC_Open( config,

    err = ISAR_LC3PLUS_DEC_Open( config,

#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING

                                 1 /*caching enabled*/,

#endif
@@ -310,7 +310,7 @@ static int openCloseDecoderWithCaching( void ) 
        return err;

    }



    IVAS_LC3PLUS_DEC_Close( &decHandle );

    ISAR_LC3PLUS_DEC_Close( &decHandle );

    return 0;

}
@@ -320,7 +320,7 @@ static int openCloseDecoderWithoutCaching( void ) 
    LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 };



    ISAR_LC3PLUS_DEC_HANDLE decHandle;

    err = IVAS_LC3PLUS_DEC_Open( config,

    err = ISAR_LC3PLUS_DEC_Open( config,

#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING

                                 1 /*caching enabled*/,

#endif
@@ -330,7 +330,7 @@ static int openCloseDecoderWithoutCaching( void ) 
        return err;

    }



    IVAS_LC3PLUS_DEC_Close( &decHandle );

    ISAR_LC3PLUS_DEC_Close( &decHandle );

    return 0;

}
@@ -342,7 +342,7 @@ static int tryOpenDecoderWithInvalidFrameDuration( void ) 
    config.lc3plus_frame_duration_us = 1234; /*unsupported frame duration*/



    ISAR_LC3PLUS_DEC_HANDLE decHandle;

    err = IVAS_LC3PLUS_DEC_Open( config,

    err = ISAR_LC3PLUS_DEC_Open( config,

#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING

                                 1 /*caching enabled*/,

#endif
@@ -362,7 +362,7 @@ static int tryOpenDecoderWithInvalidSampleRate( void ) 
    config.samplerate = 1234; /*unsupported sample rate*/



    ISAR_LC3PLUS_DEC_HANDLE decHandle;

    err = IVAS_LC3PLUS_DEC_Open( config,

    err = ISAR_LC3PLUS_DEC_Open( config,

#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING

                                 1 /*caching enabled*/,

#endif
@@ -382,7 +382,7 @@ static int encodeOneFrame( void ) 
    uint32_t bps = 128000;



    ISAR_LC3PLUS_ENC_HANDLE encHandle;

    err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle );

    err = ISAR_LC3PLUS_ENC_Open( config, bps, &encHandle );

    if ( IVAS_ERR_OK != err )

        return err;
@@ -394,17 +394,17 @@ static int encodeOneFrame( void ) 
    pcm[0] = pcm_ch1;



    int32_t bitstreamSizePerIvasFrame = 0;

    err = IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame );

    err = ISAR_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame );

    if ( IVAS_ERR_OK != err )

        return err;

    uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame );

    memset( bitstream_out, 0, bitstreamSizePerIvasFrame );



    err = IVAS_LC3PLUS_ENC_Encode( encHandle, pcm, bitstream_out );

    err = ISAR_LC3PLUS_ENC_Encode( encHandle, pcm, bitstream_out );

    if ( IVAS_ERR_OK != err )

        return err;



    IVAS_LC3PLUS_ENC_Close( &encHandle );

    ISAR_LC3PLUS_ENC_Close( &encHandle );

    free( bitstream_out );

    return 0;

}
@@ -417,7 +417,7 @@ static int encodeAndDecodeOneMonoFrame( void ) 
    uint32_t bps = 128000;



    ISAR_LC3PLUS_ENC_HANDLE encHandle;

    err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle );

    err = ISAR_LC3PLUS_ENC_Open( config, bps, &encHandle );

    if ( IVAS_ERR_OK != err )

    {

        return err;
@@ -431,21 +431,21 @@ static int encodeAndDecodeOneMonoFrame( void ) 
    pcm_in[0] = pcm_in_ch1;



    int32_t bitstreamSizePerIvasFrame = 0;

    err = IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame );

    err = ISAR_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame );

    if ( IVAS_ERR_OK != err )

        return err;



    uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame );

    memset( bitstream_out, 0, bitstreamSizePerIvasFrame );



    err = IVAS_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out );

    err = ISAR_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out );

    if ( IVAS_ERR_OK != err )

        return err;

    IVAS_LC3PLUS_ENC_Close( &encHandle );

    ISAR_LC3PLUS_ENC_Close( &encHandle );



    /* decode one frame */

    ISAR_LC3PLUS_DEC_HANDLE decHandle;

    err = IVAS_LC3PLUS_DEC_Open( config,

    err = ISAR_LC3PLUS_DEC_Open( config,

#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING

                                 1 /*caching enabled*/,

#endif
@@ -461,19 +461,19 @@ static int encodeAndDecodeOneMonoFrame( void ) 
    float pcm_out_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )];

    memset( pcm_out_ch1, 0, numSamplesPerChannels * sizeof( float ) );

    pcm_out[0] = pcm_out_ch1;

    err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out );

    err = ISAR_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out );

    if ( IVAS_ERR_OK != err )

    {

        return err;

    }



    err = IVAS_LC3PLUS_DEC_Conceal( decHandle, pcm_out );

    err = ISAR_LC3PLUS_DEC_Conceal( decHandle, pcm_out );

    if ( IVAS_ERR_OK != err )

    {

        return err;

    }



    IVAS_LC3PLUS_DEC_Close( &decHandle );

    ISAR_LC3PLUS_DEC_Close( &decHandle );

    free( bitstream_out );



    return 0;