diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index cff1f5b5e01ec4571539bf1b77c620395946f4fd..7edfbb55ea8127cef6c3b9d0f787f8bd3598f916 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 48d7a6cb28dc7eb4e67e2e3aee258797b31cbee2..d4f1fa7bbf8310066e1eb455234e704c9a5bdf21 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 e60023602e4edadb984251e5f35c91c9922f2bf6..0a7860c93f6c4bb5a21e1daf900038601542dd70 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 4a4be817345a9cedb37036c02ebdc5a9f0b66992..31c6c9fdcb1278ad4a80cde3e6f9cc650be779f9 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 2f40c1ab1beda5b883618dbd755b2a68076989f0..e02942288b58bd1b7729bf27fd2cba1327f29509 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 */