From 270d7ca71bce7e217b3e7e679d2dea33c07e5cf7 Mon Sep 17 00:00:00 2001 From: malenov Date: Fri, 16 Feb 2024 08:32:28 +0100 Subject: [PATCH] removal of unused functions --- lib_com/bitstream.c | 3 ++- lib_com/options.h | 1 + lib_com/prot.h | 3 ++- lib_enc/lib_enc.c | 3 ++- lib_enc/lib_enc.h | 3 +++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index cff1f5b5e0..7edfbb55ea 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -1772,7 +1772,7 @@ ivas_error write_indices_ivas( return error; } - +#ifndef BE_FIX_699_CLEANUP_UNUSED_FUNCTIONS /*---------------------------------------------------------------------* * convertSerialToBytestream( ) * @@ -1821,6 +1821,7 @@ void convertBytestreamToSerial( serial[i] = ( bytestream[( i >> 3 )] >> ( 7 - ( i & 7 ) ) ) & 0x1; } } +#endif /*-------------------------------------------------------------------* * decoder_selectCodec() diff --git a/lib_com/options.h b/lib_com/options.h index 48d7a6cb28..d4f1fa7bbf 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -181,6 +181,7 @@ #endif #define NONBE_FIX_984_OMASA_EXT_OUTPUT /* Nokia: issue #984: complete the OMASA EXT output implementation */ +#define BE_FIX_699_CLEANUP_UNUSED_FUNCTIONS /* VA: BE cleanup, removal of unused functions for delivery package */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_com/prot.h b/lib_com/prot.h index e60023602e..0a7860c93f 100644 --- a/lib_com/prot.h +++ b/lib_com/prot.h @@ -666,7 +666,7 @@ Decoder_State **reset_elements( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); - +#ifndef BE_FIX_699_CLEANUP_UNUSED_FUNCTIONS void convertSerialToBytestream( const uint16_t *const serial, /* i : input serial bitstream with values 0 and 1 */ const uint16_t num_bits, /* i : number of bits in the input bitstream */ @@ -678,6 +678,7 @@ void convertBytestreamToSerial( const uint16_t num_bits, /* i : number of bits in the input bitstream */ uint16_t *const serial /* o : output serial bitstream with values 0 and 1 */ ); +#endif void mdct_switching_dec( Decoder_State *st /* i/o: decoder state structure */ diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index 4a4be81734..31c6c9fdcb 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -1351,7 +1351,7 @@ ivas_error IVAS_ENC_EncodeFrameToSerial( return error; } - +#ifndef BE_FIX_699_CLEANUP_UNUSED_FUNCTIONS /*---------------------------------------------------------------------* * IVAS_ENC_EncodeFrameToCompact() * @@ -1378,6 +1378,7 @@ ivas_error IVAS_ENC_EncodeFrameToCompact( return IVAS_ERR_OK; } +#endif /*---------------------------------------------------------------------* diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h index 2f40c1ab1b..e02942288b 100644 --- a/lib_enc/lib_enc.h +++ b/lib_enc/lib_enc.h @@ -295,6 +295,7 @@ ivas_error IVAS_ENC_EncodeFrameToSerial( uint16_t *numOutBits /* o : number of bits written to output bitstream. Each bit is stored as a single uint16_t value */ ); +#ifndef BE_FIX_699_CLEANUP_UNUSED_FUNCTIONS /*! r: error code */ ivas_error IVAS_ENC_EncodeFrameToCompact( IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle */ @@ -304,6 +305,8 @@ ivas_error IVAS_ENC_EncodeFrameToCompact( uint16_t *numOutBits /* o : number of bits written to output bitstream */ ); +#endif + /* Setter functions - apply changes to encoder configuration */ /*! r: error code */ -- GitLab