rename file

libs/celt/README_LLCON

@@ -7,6 +7,7 @@ Changes made to libcelt to be compatible to llcon:
 
 - replaced all "restricted" by "__restricted" and all "inline" by "__inline"
 
+- added a "cc6_" prior to all file names, functions and global variables
 
 ----------------------------------------------------------------------------------
 Attempt to use newer version failed due to the following reasons:

libs/celt/cc6_celt_types.h

@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: celt_types.h,v 1.1 2009-08-12 18:50:49 corrados Exp $
+ last mod: $Id: cc6_celt_types.h,v 1.1 2013-02-13 17:02:23 corrados Exp $
 
  ********************************************************************/
 /**

libs/celt/header.c

@@ -1,140 +1,140 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
+/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+*/
-/*
+/*
-   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
-   documentation and/or other materials provided with the distribution.
+   documentation and/or other materials provided with the distribution.
-   
+   
-   - Neither the name of the Xiph.org Foundation nor the names of its
+   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
+   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
+   this software without specific prior written permission.
-   
+   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+*/
-
+
-#ifdef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "config.h"
-#endif
+#endif
-
+
-#include "celt_header.h"
+#include "cc6_celt_header.h"
-#include "os_support.h"
+#include "os_support.h"
-#include "modes.h"
+#include "modes.h"
-
+
-/*typedef struct {
+/*typedef struct {
-   char         codec_id[8];
+   char         codec_id[8];
-   char         codec_version[20];
+   char         codec_version[20];
-   celt_int32_t version_id;
+   celt_int32_t version_id;
-   celt_int32_t header_size;
+   celt_int32_t header_size;
-   celt_int32_t mode;
+   celt_int32_t mode;
-   celt_int32_t sample_rate;
+   celt_int32_t sample_rate;
-   celt_int32_t nb_channels;
+   celt_int32_t nb_channels;
-   celt_int32_t bytes_per_packet;
+   celt_int32_t bytes_per_packet;
-   celt_int32_t extra_headers;
+   celt_int32_t extra_headers;
-} CELTHeader;*/
+} CELTHeader;*/
-
+
-static  celt_uint32_t
+static  celt_uint32_t
-_le_32 (celt_uint32_t i)
+_le_32 (celt_uint32_t i)
-{
+{
-   celt_uint32_t ret=i;
+   celt_uint32_t ret=i;
-#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
+#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
-   ret =  (i>>24);
+   ret =  (i>>24);
-   ret += (i>>8) & 0x0000ff00;
+   ret += (i>>8) & 0x0000ff00;
-   ret += (i<<8) & 0x00ff0000;
+   ret += (i<<8) & 0x00ff0000;
-   ret += (i<<24);
+   ret += (i<<24);
-#endif
+#endif
-   return ret;
+   return ret;
-}
+}
-
+
-int celt_header_init(CELTHeader *header, const CELTMode *m)
+int celt_header_init(CELTHeader *header, const CELTMode *m)
-{
+{
-
+
-   if (check_mode(m) != CELT_OK)
+   if (check_mode(m) != CELT_OK)
-     return CELT_INVALID_MODE;
+     return CELT_INVALID_MODE;
-   if (header==NULL)
+   if (header==NULL)
-     return CELT_BAD_ARG;        
+     return CELT_BAD_ARG;        
-
+
-   CELT_COPY(header->codec_id, "CELT    ", 8);
+   CELT_COPY(header->codec_id, "CELT    ", 8);
-   CELT_COPY(header->codec_version, "experimental        ", 20);
+   CELT_COPY(header->codec_version, "experimental        ", 20);
-
+
-   celt_mode_info(m, CELT_GET_BITSTREAM_VERSION, &header->version_id);
+   celt_mode_info(m, CELT_GET_BITSTREAM_VERSION, &header->version_id);
-   header->header_size = 56;
+   header->header_size = 56;
-   header->sample_rate = m->Fs;
+   header->sample_rate = m->Fs;
-   header->nb_channels = m->nbChannels;
+   header->nb_channels = m->nbChannels;
-   header->frame_size = m->mdctSize;
+   header->frame_size = m->mdctSize;
-   header->overlap = m->overlap;
+   header->overlap = m->overlap;
-   header->bytes_per_packet = -1;
+   header->bytes_per_packet = -1;
-   header->extra_headers = 0;
+   header->extra_headers = 0;
-   return CELT_OK;
+   return CELT_OK;
-}
+}
-
+
-int celt_header_to_packet(const CELTHeader *header, unsigned char *packet, celt_uint32_t size)
+int celt_header_to_packet(const CELTHeader *header, unsigned char *packet, celt_uint32_t size)
-{
+{
-   celt_int32_t * h;
+   celt_int32_t * h;
-
+
-   if ((size < 56) || (header==NULL) || (packet==NULL))
+   if ((size < 56) || (header==NULL) || (packet==NULL))
-     return CELT_BAD_ARG; /* FAIL */
+     return CELT_BAD_ARG; /* FAIL */
-
+
-   CELT_MEMSET(packet, 0, sizeof(*header));
+   CELT_MEMSET(packet, 0, sizeof(*header));
-   /* FIXME: Do it in an alignment-safe manner */
+   /* FIXME: Do it in an alignment-safe manner */
-
+
-   /* Copy ident and version */
+   /* Copy ident and version */
-   CELT_COPY(packet, (unsigned char*)header, 28);
+   CELT_COPY(packet, (unsigned char*)header, 28);
-
+
-   /* Copy the int32 fields */
+   /* Copy the int32 fields */
-   h = (celt_int32_t*)(packet+28);
+   h = (celt_int32_t*)(packet+28);
-   *h++ = _le_32 (header->version_id);
+   *h++ = _le_32 (header->version_id);
-   *h++ = _le_32 (header->header_size);
+   *h++ = _le_32 (header->header_size);
-   *h++ = _le_32 (header->sample_rate);
+   *h++ = _le_32 (header->sample_rate);
-   *h++ = _le_32 (header->nb_channels);
+   *h++ = _le_32 (header->nb_channels);
-   *h++ = _le_32 (header->frame_size);
+   *h++ = _le_32 (header->frame_size);
-   *h++ = _le_32 (header->overlap);
+   *h++ = _le_32 (header->overlap);
-   *h++ = _le_32 (header->bytes_per_packet);
+   *h++ = _le_32 (header->bytes_per_packet);
-   *h   = _le_32 (header->extra_headers);
+   *h   = _le_32 (header->extra_headers);
-
+
-   return sizeof(*header);
+   return sizeof(*header);
-}
+}
-
+
-int celt_header_from_packet(const unsigned char *packet, celt_uint32_t size, CELTHeader *header)
+int celt_header_from_packet(const unsigned char *packet, celt_uint32_t size, CELTHeader *header)
-{
+{
-   celt_int32_t * h;
+   celt_int32_t * h;
-
+
-   if ((size < 56) || (header==NULL) || (packet==NULL))
+   if ((size < 56) || (header==NULL) || (packet==NULL))
-     return CELT_BAD_ARG; /* FAIL */
+     return CELT_BAD_ARG; /* FAIL */
-
+
-   CELT_MEMSET((unsigned char*)header, 0, sizeof(*header));
+   CELT_MEMSET((unsigned char*)header, 0, sizeof(*header));
-   /* FIXME: Do it in an alignment-safe manner */
+   /* FIXME: Do it in an alignment-safe manner */
-
+
-   /* Copy ident and version */
+   /* Copy ident and version */
-   CELT_COPY((unsigned char*)header, packet, 28);
+   CELT_COPY((unsigned char*)header, packet, 28);
-
+
-   /* Copy the int32 fields */
+   /* Copy the int32 fields */
-   h = (celt_int32_t*)(packet+28);
+   h = (celt_int32_t*)(packet+28);
-   header->version_id       = _le_32(*h++);
+   header->version_id       = _le_32(*h++);
-   header->header_size      = _le_32(*h++);
+   header->header_size      = _le_32(*h++);
-   header->sample_rate      = _le_32(*h++);
+   header->sample_rate      = _le_32(*h++);
-   header->nb_channels      = _le_32(*h++);
+   header->nb_channels      = _le_32(*h++);
-   header->frame_size       = _le_32(*h++);
+   header->frame_size       = _le_32(*h++);
-   header->overlap          = _le_32(*h++);
+   header->overlap          = _le_32(*h++);
-   header->bytes_per_packet = _le_32(*h++);
+   header->bytes_per_packet = _le_32(*h++);
-   header->extra_headers    = _le_32(*h);
+   header->extra_headers    = _le_32(*h);
-
+
-   return sizeof(*header);
+   return sizeof(*header);
-}
+}
-
+

llcon.pro

@@ -97,7 +97,7 @@ HEADERS += src/audiomixerboard.h \
     src/util.h \
     libs/celt/cc6_celt.h \
     libs/celt/celt_types.h \
-    libs/celt/celt_header.h \
+    libs/celt/cc6_celt_header.h \
     libs/celt/_kiss_fft_guts.h \
     libs/celt/arch.h \
     libs/celt/bands.h \
@@ -155,7 +155,7 @@ SOURCES += src/audiomixerboard.cpp \
     libs/celt/entenc.c \
     libs/celt/header.c \
     libs/celt/kfft_single.c \
-    libs/celt/_kiss_fft.c \
+    libs/celt/cc6__kiss_fft.c \
     libs/celt/_kiss_fftr.c \
     libs/celt/laplace.c \
     libs/celt/mdct.c \