[asterisk-commits] dvossel: branch dvossel/celt_codec_ftw r313096 - in /team/dvossel/celt_codec_...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Apr  7 17:23:09 2011
New Revision: 313096

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=313096
Log:
Fixes compile issue, adds codec.conf documentation

Modified:
    team/dvossel/celt_codec_ftw/configs/codecs.conf.sample
    team/dvossel/celt_codec_ftw/formats/format_attr_celt.c
    team/dvossel/celt_codec_ftw/include/asterisk/celt.h

Modified: team/dvossel/celt_codec_ftw/configs/codecs.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/configs/codecs.conf.sample?view=diff&rev=313096&r1=313095&r2=313096
==============================================================================
--- team/dvossel/celt_codec_ftw/configs/codecs.conf.sample (original)
+++ team/dvossel/celt_codec_ftw/configs/codecs.conf.sample Thu Apr  7 17:23:09 2011
@@ -139,10 +139,10 @@
 
 [celt44]
 type=celt
-samprate=44100
-framesize=512
+samprate=44100   ; The samplerate in hz. This option is required.
+;framesize=480   ; The framesize option represents the duration of each frame in samples.
+                 ; This must be a factor of 2.  This option defaults to 480.
 
 [celt48]
 type=celt
 samprate=48000
-framesize=512

Modified: team/dvossel/celt_codec_ftw/formats/format_attr_celt.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/formats/format_attr_celt.c?view=diff&rev=313096&r1=313095&r2=313096
==============================================================================
--- team/dvossel/celt_codec_ftw/formats/format_attr_celt.c (original)
+++ team/dvossel/celt_codec_ftw/formats/format_attr_celt.c Thu Apr  7 17:23:09 2011
@@ -29,8 +29,6 @@
 
 #include "asterisk/module.h"
 #include "asterisk/format.h"
-
-#define AST_CELT_DEFAULT_FRAME_SIZE = 480
 
 /*!
  * \brief CELT attribute structure.

Modified: team/dvossel/celt_codec_ftw/include/asterisk/celt.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/include/asterisk/celt.h?view=diff&rev=313096&r1=313095&r2=313096
==============================================================================
--- team/dvossel/celt_codec_ftw/include/asterisk/celt.h (original)
+++ team/dvossel/celt_codec_ftw/include/asterisk/celt.h Thu Apr  7 17:23:09 2011
@@ -25,7 +25,7 @@
 #ifndef _AST_FORMAT_CELT_H_
 #define _AST_FORMAT_CELT_H_
 
-#define AST_CELT_DEFAULT_FRAME_SIZE = 512
+#define AST_CELT_DEFAULT_FRAME_SIZE = 480
 
 /*! CELT format attribute key value pairs, all are accessible through ast_format_get_value()*/
 enum celt_attr_keys {