celt.h   celt.h 
/* (C) 2007-2008 Jean-Marc Valin, CSIRO /* Copyright (c) 2007-2008 CSIRO
(C) 2008 Gregory Maxwell */ Copyright (c) 2007-2009 Xiph.Org Foundation
Copyright (c) 2008 Gregory Maxwell
Written by Jean-Marc Valin and Gregory Maxwell */
/** /**
@file celt.h @file celt.h
@brief Contains all the functions for encoding and decoding audio @brief Contains all the functions for encoding and decoding audio
*/ */
/* /*
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
skipping to change at line 54 skipping to change at line 56
#endif #endif
#if defined(__GNUC__) && defined(CELT_BUILD) #if defined(__GNUC__) && defined(CELT_BUILD)
#define EXPORT __attribute__ ((visibility ("default"))) #define EXPORT __attribute__ ((visibility ("default")))
#elif defined(WIN32) #elif defined(WIN32)
#define EXPORT __declspec(dllexport) #define EXPORT __declspec(dllexport)
#else #else
#define EXPORT #define EXPORT
#endif #endif
#define _celt_check_int(x) (((void)((x) == (celt_int32_t)0)), (celt_int32_t )(x)) #define _celt_check_int(x) (((void)((x) == (celt_int32)0)), (celt_int32)(x) )
#define _celt_check_mode_ptr_ptr(ptr) ((ptr) + ((ptr) - (CELTMode**)(ptr))) #define _celt_check_mode_ptr_ptr(ptr) ((ptr) + ((ptr) - (CELTMode**)(ptr)))
/* Error codes */ /* Error codes */
/** No error */ /** No error */
#define CELT_OK 0 #define CELT_OK 0
/** An (or more) invalid argument (e.g. out of range) */ /** An (or more) invalid argument (e.g. out of range) */
#define CELT_BAD_ARG -1 #define CELT_BAD_ARG -1
/** The mode struct passed is invalid */ /** The mode struct passed is invalid */
#define CELT_INVALID_MODE -2 #define CELT_INVALID_MODE -2
/** An internal error was detected */ /** An internal error was detected */
#define CELT_INTERNAL_ERROR -3 #define CELT_INTERNAL_ERROR -3
/** The data passed (e.g. compressed data to decoder) is corrupted */ /** The data passed (e.g. compressed data to decoder) is corrupted */
#define CELT_CORRUPTED_DATA -4 #define CELT_CORRUPTED_DATA -4
/** Invalid/unsupported request number */ /** Invalid/unsupported request number */
#define CELT_UNIMPLEMENTED -5 #define CELT_UNIMPLEMENTED -5
/** An encoder or decoder structure is invalid or already freed */ /** An encoder or decoder structure is invalid or already freed */
#define CELT_INVALID_STATE -6 #define CELT_INVALID_STATE -6
/** Memory allocation has failed */
#define CELT_ALLOC_FAIL -7
/* Requests */ /* Requests */
#define CELT_GET_MODE_REQUEST 1 #define CELT_GET_MODE_REQUEST 1
/** Get the CELTMode used by an encoder or decoder */ /** Get the CELTMode used by an encoder or decoder */
#define CELT_GET_MODE(x) CELT_GET_MODE_REQUEST, _celt_check_mode_ptr_ptr(x) #define CELT_GET_MODE(x) CELT_GET_MODE_REQUEST, _celt_check_mode_ptr_ptr(x)
#define CELT_SET_COMPLEXITY_REQUEST 2 #define CELT_SET_COMPLEXITY_REQUEST 2
/** Controls the complexity from 0-10 (int) */ /** Controls the complexity from 0-10 (int) */
#define CELT_SET_COMPLEXITY(x) CELT_SET_COMPLEXITY_REQUEST, _celt_check_int (x) #define CELT_SET_COMPLEXITY(x) CELT_SET_COMPLEXITY_REQUEST, _celt_check_int (x)
#define CELT_SET_PREDICTION_REQUEST 4 #define CELT_SET_PREDICTION_REQUEST 4
/** Controls the use of interframe prediction. /** Controls the use of interframe prediction.
skipping to change at line 98 skipping to change at line 102
/** Set the target VBR rate in bits per second(int); 0=CBR (default) */ /** Set the target VBR rate in bits per second(int); 0=CBR (default) */
#define CELT_SET_VBR_RATE(x) CELT_SET_VBR_RATE_REQUEST, _celt_check_int(x) #define CELT_SET_VBR_RATE(x) CELT_SET_VBR_RATE_REQUEST, _celt_check_int(x)
/** Reset the encoder/decoder memories to zero*/ /** Reset the encoder/decoder memories to zero*/
#define CELT_RESET_STATE_REQUEST 8 #define CELT_RESET_STATE_REQUEST 8
#define CELT_RESET_STATE CELT_RESET_STATE_REQUEST #define CELT_RESET_STATE CELT_RESET_STATE_REQUEST
/** GET the frame size used in the current mode */ /** GET the frame size used in the current mode */
#define CELT_GET_FRAME_SIZE 1000 #define CELT_GET_FRAME_SIZE 1000
/** GET the lookahead used in the current mode */ /** GET the lookahead used in the current mode */
#define CELT_GET_LOOKAHEAD 1001 #define CELT_GET_LOOKAHEAD 1001
/** GET the number of channels used in the current mode */
#define CELT_GET_NB_CHANNELS 1002
/** GET the sample rate used in the current mode */ /** GET the sample rate used in the current mode */
#define CELT_GET_SAMPLE_RATE 1003 #define CELT_GET_SAMPLE_RATE 1003
/** GET the bit-stream version for compatibility check */ /** GET the bit-stream version for compatibility check */
#define CELT_GET_BITSTREAM_VERSION 2000 #define CELT_GET_BITSTREAM_VERSION 2000
/** Contains the state of an encoder. One encoder state is needed /** Contains the state of an encoder. One encoder state is needed
for each stream. It is initialised once at the beginning of the for each stream. It is initialised once at the beginning of the
stream. Do *not* re-initialise the state for every frame. stream. Do *not* re-initialise the state for every frame.
@brief Encoder state @brief Encoder state
skipping to change at line 133 skipping to change at line 135
/** \defgroup codec Encoding and decoding */ /** \defgroup codec Encoding and decoding */
/* @{ */ /* @{ */
/* Mode calls */ /* Mode calls */
/** Creates a new mode struct. This will be passed to an encoder or /** Creates a new mode struct. This will be passed to an encoder or
decoder. The mode MUST NOT BE DESTROYED until the encoders and decoder. The mode MUST NOT BE DESTROYED until the encoders and
decoders that use it are destroyed as well. decoders that use it are destroyed as well.
@param Fs Sampling rate (32000 to 96000 Hz) @param Fs Sampling rate (32000 to 96000 Hz)
@param channels Number of channels
@param frame_size Number of samples (per channel) to encode in each @param frame_size Number of samples (per channel) to encode in each
packet (even values; 64 - 512) packet (even values; 64 - 512)
@param error Returned error code (if NULL, no error will be returned) @param error Returned error code (if NULL, no error will be returned)
@return A newly created mode @return A newly created mode
*/ */
EXPORT CELTMode *celt_mode_create(celt_int32_t Fs, int channels, int frame_ size, int *error); EXPORT CELTMode *celt_mode_create(celt_int32 Fs, int frame_size, int *error );
/** Destroys a mode struct. Only call this after all encoders and /** Destroys a mode struct. Only call this after all encoders and
decoders using this mode are destroyed as well. decoders using this mode are destroyed as well.
@param mode Mode to be destroyed @param mode Mode to be destroyed
*/ */
EXPORT void celt_mode_destroy(CELTMode *mode); EXPORT void celt_mode_destroy(CELTMode *mode);
/** Query information from a mode */ /** Query information from a mode */
EXPORT int celt_mode_info(const CELTMode *mode, int request, celt_int32_t * value); EXPORT int celt_mode_info(const CELTMode *mode, int request, celt_int32 *va lue);
/* Encoder stuff */ /* Encoder stuff */
/** Creates a new encoder state. Each stream needs its own encoder /** Creates a new encoder state. Each stream needs its own encoder
state (can't be shared across simultaneous streams). state (can't be shared across simultaneous streams).
@param mode Contains all the information about the characteristics of @param mode Contains all the information about the characteristics of
* the stream (must be the same characteristics as used for the * the stream (must be the same characteristics as used for the
* decoder) * decoder)
@param channels Number of channels
@param error Returns an error code
@return Newly created encoder state. @return Newly created encoder state.
*/ */
EXPORT CELTEncoder *celt_encoder_create(const CELTMode *mode); EXPORT CELTEncoder *celt_encoder_create(const CELTMode *mode, int channels, int *error);
/** Destroys a an encoder state. /** Destroys a an encoder state.
@param st Encoder state to be destroyed @param st Encoder state to be destroyed
*/ */
EXPORT void celt_encoder_destroy(CELTEncoder *st); EXPORT void celt_encoder_destroy(CELTEncoder *st);
/** Encodes a frame of audio. /** Encodes a frame of audio.
@param st Encoder state @param st Encoder state
@param pcm PCM audio in float format, with a normal range of ±1.0. @param pcm PCM audio in float format, with a normal range of ±1.0.
* Samples with a range beyond ±1.0 are supported but will * Samples with a range beyond ±1.0 are supported but will
skipping to change at line 208 skipping to change at line 211
@param compressed The compressed data is written here. This may not alias pcm or @param compressed The compressed data is written here. This may not alias pcm or
* optional_synthesis. * optional_synthesis.
@param nbCompressedBytes Maximum number of bytes to use for compressing th e frame @param nbCompressedBytes Maximum number of bytes to use for compressing th e frame
* (can change from one frame to another) * (can change from one frame to another)
@return Number of bytes written to "compressed". Will be the same as @return Number of bytes written to "compressed". Will be the same as
* "nbCompressedBytes" unless the stream is VBR and will never be lar ger. * "nbCompressedBytes" unless the stream is VBR and will never be lar ger.
* If negative, an error has occurred (see error codes). It is IMPORT ANT that * If negative, an error has occurred (see error codes). It is IMPORT ANT that
* the length returned be somehow transmitted to the decoder. Otherwi se, no * the length returned be somehow transmitted to the decoder. Otherwi se, no
* decoding is possible. * decoding is possible.
*/ */
EXPORT int celt_encode(CELTEncoder *st, const celt_int16_t *pcm, celt_int16 _t *optional_synthesis, unsigned char *compressed, int nbCompressedBytes); EXPORT int celt_encode(CELTEncoder *st, const celt_int16 *pcm, celt_int16 * optional_synthesis, unsigned char *compressed, int nbCompressedBytes);
/** Query and set encoder parameters /** Query and set encoder parameters
@param st Encoder state @param st Encoder state
@param request Parameter to change or query @param request Parameter to change or query
@param value Pointer to a 32-bit int value @param value Pointer to a 32-bit int value
@return Error code @return Error code
*/ */
EXPORT int celt_encoder_ctl(CELTEncoder * st, int request, ...); EXPORT int celt_encoder_ctl(CELTEncoder * st, int request, ...);
/* Decoder stuff */ /* Decoder stuff */
/** Creates a new decoder state. Each stream needs its own decoder state (c an't /** Creates a new decoder state. Each stream needs its own decoder state (c an't
be shared across simultaneous streams). be shared across simultaneous streams).
@param mode Contains all the information about the characteristics of the @param mode Contains all the information about the characteristics of the
stream (must be the same characteristics as used for the encod er) stream (must be the same characteristics as used for the encod er)
@param channels Number of channels
@param error Returns an error code
@return Newly created decoder state. @return Newly created decoder state.
*/ */
EXPORT CELTDecoder *celt_decoder_create(const CELTMode *mode); EXPORT CELTDecoder *celt_decoder_create(const CELTMode *mode, int channels, int *error);
/** Destroys a a decoder state. /** Destroys a a decoder state.
@param st Decoder state to be destroyed @param st Decoder state to be destroyed
*/ */
EXPORT void celt_decoder_destroy(CELTDecoder *st); EXPORT void celt_decoder_destroy(CELTDecoder *st);
/** Decodes a frame of audio. /** Decodes a frame of audio.
@param st Decoder state @param st Decoder state
@param data Compressed data produced by an encoder @param data Compressed data produced by an encoder
@param len Number of bytes to read from "data". This MUST be exactly the n umber @param len Number of bytes to read from "data". This MUST be exactly the n umber
skipping to change at line 253 skipping to change at line 258
/** Decodes a frame of audio. /** Decodes a frame of audio.
@param st Decoder state @param st Decoder state
@param data Compressed data produced by an encoder @param data Compressed data produced by an encoder
@param len Number of bytes to read from "data". This MUST be exactly the n umber @param len Number of bytes to read from "data". This MUST be exactly the n umber
of bytes returned by the encoder. Using a larger value WILL NOT WORK. of bytes returned by the encoder. Using a larger value WILL NOT WORK.
@param pcm One frame (frame_size samples per channel) of decoded PCM will be @param pcm One frame (frame_size samples per channel) of decoded PCM will be
returned here in 16-bit PCM format (native endian). returned here in 16-bit PCM format (native endian).
@return Error code. @return Error code.
*/ */
EXPORT int celt_decode(CELTDecoder *st, const unsigned char *data, int len, celt_int16_t *pcm); EXPORT int celt_decode(CELTDecoder *st, const unsigned char *data, int len, celt_int16 *pcm);
/** Query and set decoder parameters /** Query and set decoder parameters
@param st Decoder state @param st Decoder state
@param request Parameter to change or query @param request Parameter to change or query
@param value Pointer to a 32-bit int value @param value Pointer to a 32-bit int value
@return Error code @return Error code
*/ */
EXPORT int celt_decoder_ctl(CELTDecoder * st, int request, ...); EXPORT int celt_decoder_ctl(CELTDecoder * st, int request, ...);
/** Returns the English string that corresponds to an error code
* @param error Error code (negative for an error, 0 for success
* @return Constant string (must NOT be freed)
*/
EXPORT const char *celt_strerror(int error);
/* @} */ /* @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /*CELT_H */ #endif /*CELT_H */
 End of changes. 14 change blocks. 
12 lines changed or deleted 23 lines changed or added


 celt_header.h   celt_header.h 
/* (C) 2008 Jean-Marc Valin, CSIRO /* Copyright (c) 2007 CSIRO
*/ Copyright (c) 2007-2008 Xiph.Org Foundation
Written by Jean-Marc Valin */
/* /*
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
- Redistributions of source code must retain the above copyright - Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
skipping to change at line 48 skipping to change at line 49
#include "celt.h" #include "celt.h"
#include "celt_types.h" #include "celt_types.h"
/** Header data to be used for Ogg files (or possibly other encapsulation) /** Header data to be used for Ogg files (or possibly other encapsulation)
@brief Header data @brief Header data
*/ */
typedef struct { typedef struct {
char codec_id[8]; /**< MUST be "CELT " (four spaces) */ char codec_id[8]; /**< MUST be "CELT " (four spaces) */
char codec_version[20]; /**< Version used (as string) */ char codec_version[20]; /**< Version used (as string) */
celt_int32_t version_id; /**< Version id (negative for until stre celt_int32 version_id; /**< Version id (negative for until stream
am is frozen) */ is frozen) */
celt_int32_t header_size; /**< Size of this header */ celt_int32 header_size; /**< Size of this header */
celt_int32_t sample_rate; /**< Sampling rate of the original audio celt_int32 sample_rate; /**< Sampling rate of the original audio *
*/ /
celt_int32_t nb_channels; /**< Number of channels */ celt_int32 nb_channels; /**< Number of channels */
celt_int32_t frame_size; /**< Samples per frame (per channel) */ celt_int32 frame_size; /**< Samples per frame (per channel) */
celt_int32_t overlap; /**< Overlapping samples (per channel) * celt_int32 overlap; /**< Overlapping samples (per channel) */
/ celt_int32 bytes_per_packet; /**< Number of bytes per compressed packet
celt_int32_t bytes_per_packet; /**< Number of bytes per compressed pack (0 if unknown) */
et (0 if unknown) */ celt_int32 extra_headers; /**< Number of additional headers that fol
celt_int32_t extra_headers; /**< Number of additional headers that f low this header */
ollow this header */
} CELTHeader; } CELTHeader;
/** Creates a basic header struct */ /** Creates a basic header struct */
EXPORT int celt_header_init(CELTHeader *header, const CELTMode *m); EXPORT int celt_header_init(CELTHeader *header, const CELTMode *m, int chan nels);
EXPORT int celt_header_to_packet(const CELTHeader *header, unsigned char *p acket, celt_uint32_t size); EXPORT int celt_header_to_packet(const CELTHeader *header, unsigned char *p acket, celt_uint32 size);
EXPORT int celt_header_from_packet(const unsigned char *packet, celt_uint32 _t size, CELTHeader *header); EXPORT int celt_header_from_packet(const unsigned char *packet, celt_uint32 size, CELTHeader *header);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* CELT_HEADER_H */ #endif /* CELT_HEADER_H */
 End of changes. 5 change blocks. 
18 lines changed or deleted 18 lines changed or added


 celt_types.h   celt_types.h 
skipping to change at line 29 skipping to change at line 29
@file celt_types.h @file celt_types.h
@brief CELT types @brief CELT types
*/ */
#ifndef _CELT_TYPES_H #ifndef _CELT_TYPES_H
#define _CELT_TYPES_H #define _CELT_TYPES_H
/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */ /* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
#if (defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defi ned(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HA VE_STDINT_H)) #if (defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defi ned(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HA VE_STDINT_H))
#include <stdint.h> #include <stdint.h>
typedef int16_t celt_int16_t; typedef int16_t celt_int16;
typedef uint16_t celt_uint16_t; typedef uint16_t celt_uint16;
typedef int32_t celt_int32_t; typedef int32_t celt_int32;
typedef uint32_t celt_uint32_t; typedef uint32_t celt_uint32;
typedef int64_t celt_int64_t;
typedef uint64_t celt_uint64_t;
#elif defined(_WIN32) #elif defined(_WIN32)
# if defined(__CYGWIN__) # if defined(__CYGWIN__)
# include <_G_config.h> # include <_G_config.h>
typedef _G_int32_t celt_int32_t; typedef _G_int32_t celt_int32;
typedef _G_uint32_t celt_uint32_t; typedef _G_uint32_t celt_uint32;
typedef _G_int16_t celt_int16_t; typedef _G_int16 celt_int16;
typedef _G_uint16_t celt_uint16_t; typedef _G_uint16 celt_uint16;
typedef _G_int64_t celt_int64_t;
typedef _G_uint64_t celt_uint64_t;
# elif defined(__MINGW32__) # elif defined(__MINGW32__)
typedef short celt_int16_t; typedef short celt_int16;
typedef unsigned short celt_uint16_t; typedef unsigned short celt_uint16;
typedef int celt_int32_t; typedef int celt_int32;
typedef unsigned int celt_uint32_t; typedef unsigned int celt_uint32;
typedef long long celt_int64_t;
typedef unsigned long long celt_uint64_t;
# elif defined(__MWERKS__) # elif defined(__MWERKS__)
typedef int celt_int32_t; typedef int celt_int32;
typedef unsigned int celt_uint32_t; typedef unsigned int celt_uint32;
typedef short celt_int16_t; typedef short celt_int16;
typedef unsigned short celt_uint16_t; typedef unsigned short celt_uint16;
typedef long long celt_int64_t;
typedef unsigned long long celt_uint64_t;
# else # else
/* MSVC/Borland */ /* MSVC/Borland */
typedef __int32 celt_int32_t; typedef __int32 celt_int32;
typedef unsigned __int32 celt_uint32_t; typedef unsigned __int32 celt_uint32;
typedef __int16 celt_int16_t; typedef __int16 celt_int16;
typedef unsigned __int16 celt_uint16_t; typedef unsigned __int16 celt_uint16;
typedef __int64 celt_int64_t;
typedef unsigned __int64 celt_uint64_t;
# endif # endif
#elif defined(__MACOS__) #elif defined(__MACOS__)
# include <sys/types.h> # include <sys/types.h>
typedef SInt16 celt_int16_t; typedef SInt16 celt_int16;
typedef UInt16 celt_uint16_t; typedef UInt16 celt_uint16;
typedef SInt32 celt_int32_t; typedef SInt32 celt_int32;
typedef UInt32 celt_uint32_t; typedef UInt32 celt_uint32;
typedef SInt64 celt_int64_t;
typedef UInt64 celt_uint64_t;
#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */ #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
# include <sys/types.h> # include <sys/types.h>
typedef int16_t celt_int16_t; typedef int16 celt_int16;
typedef u_int16_t celt_uint16_t; typedef u_int16 celt_uint16;
typedef int32_t celt_int32_t; typedef int32_t celt_int32;
typedef u_int32_t celt_uint32_t; typedef u_int32_t celt_uint32;
typedef int64_t celt_int64_t;
typedef u_int64_t celt_uint64_t;
#elif defined(__BEOS__) #elif defined(__BEOS__)
/* Be */ /* Be */
# include <inttypes.h> # include <inttypes.h>
typedef int16_t celt_int16_t; typedef int16 celt_int16;
typedef u_int16_t celt_uint16_t; typedef u_int16 celt_uint16;
typedef int32_t celt_int32_t; typedef int32_t celt_int32;
typedef u_int32_t celt_uint32_t; typedef u_int32_t celt_uint32;
typedef int64_t celt_int64_t;
typedef u_int64_t celt_uint64_t;
#elif defined (__EMX__) #elif defined (__EMX__)
/* OS/2 GCC */ /* OS/2 GCC */
typedef short celt_int16_t; typedef short celt_int16;
typedef unsigned short celt_uint16_t; typedef unsigned short celt_uint16;
typedef int celt_int32_t; typedef int celt_int32;
typedef unsigned int celt_uint32_t; typedef unsigned int celt_uint32;
typedef long long celt_int64_t;
typedef unsigned long long celt_uint64_t;
#elif defined (DJGPP) #elif defined (DJGPP)
/* DJGPP */ /* DJGPP */
typedef short celt_int16_t; typedef short celt_int16;
typedef int celt_int32_t; typedef unsigned short celt_uint16;
typedef unsigned int celt_uint32_t; typedef int celt_int32;
typedef long long celt_int64_t; typedef unsigned int celt_uint32;
typedef unsigned long long celt_uint64_t;
#elif defined(R5900) #elif defined(R5900)
/* PS2 EE */ /* PS2 EE */
typedef int celt_int32_t; typedef int celt_int32;
typedef unsigned celt_uint32_t; typedef unsigned celt_uint32;
typedef short celt_int16_t; typedef short celt_int16;
typedef long celt_int64_t; typedef unsigned short celt_uint16;
typedef unsigned long celt_uint64_t;
#elif defined(__SYMBIAN32__) #elif defined(__SYMBIAN32__)
/* Symbian GCC */ /* Symbian GCC */
typedef signed short celt_int16_t; typedef signed short celt_int16;
typedef unsigned short celt_uint16_t; typedef unsigned short celt_uint16;
typedef signed int celt_int32_t; typedef signed int celt_int32;
typedef unsigned int celt_uint32_t; typedef unsigned int celt_uint32;
typedef long long int celt_int64_t;
typedef unsigned long long int celt_uint64_t;
#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X) #elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
typedef short celt_int16_t; typedef short celt_int16;
typedef unsigned short celt_uint16_t; typedef unsigned short celt_uint16;
typedef long celt_int32_t; typedef long celt_int32;
typedef unsigned long celt_uint32_t; typedef unsigned long celt_uint32;
typedef long long celt_int64_t;
typedef unsigned long long celt_uint64_t;
#elif defined(CONFIG_TI_C6X) #elif defined(CONFIG_TI_C6X)
typedef short celt_int16_t; typedef short celt_int16;
typedef unsigned short celt_uint16_t; typedef unsigned short celt_uint16;
typedef int celt_int32_t; typedef int celt_int32;
typedef unsigned int celt_uint32_t; typedef unsigned int celt_uint32;
typedef long long int celt_int64_t;
typedef unsigned long long int celt_uint64_t;
#else #else
/* Give up, take a reasonable guess */ /* Give up, take a reasonable guess */
typedef short celt_int16_t; typedef short celt_int16;
typedef unsigned short celt_uint16_t; typedef unsigned short celt_uint16;
typedef int celt_int32_t; typedef int celt_int32;
typedef unsigned int celt_uint32_t; typedef unsigned int celt_uint32;
typedef long long celt_int64_t;
typedef unsigned long long celt_uint64_t;
#endif #endif
#endif /* _CELT_TYPES_H */ #endif /* _CELT_TYPES_H */
 End of changes. 15 change blocks. 
88 lines changed or deleted 60 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/