[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step1 r299193 - /team/dvossel/fixt...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Dec 20 20:44:43 UTC 2010


Author: dvossel
Date: Mon Dec 20 14:44:39 2010
New Revision: 299193

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299193
Log:
kill the mixture of spaces and tabs

Modified:
    team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h

Modified: team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h?view=diff&rev=299193&r1=299192&r2=299193
==============================================================================
--- team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h (original)
+++ team/dvossel/fixtheworld_phase1_step1/include/asterisk/format.h Mon Dec 20 14:44:39 2010
@@ -40,72 +40,72 @@
 
 /* \brief Format Categories*/
 enum ast_format_type {
-    AST_FORMATNEW_TYPE_AUDIO = 1 * AST_FORMATNEW_INC,
-    AST_FORMATNEW_TYPE_VIDEO = 2 * AST_FORMATNEW_INC,
-    AST_FORMATNEW_TYPE_IMAGE = 3 * AST_FORMATNEW_INC,
-    AST_FORMATNEW_TYPE_TEXT  = 4 * AST_FORMATNEW_INC,
+	AST_FORMATNEW_TYPE_AUDIO = 1 * AST_FORMATNEW_INC,
+	AST_FORMATNEW_TYPE_VIDEO = 2 * AST_FORMATNEW_INC,
+	AST_FORMATNEW_TYPE_IMAGE = 3 * AST_FORMATNEW_INC,
+	AST_FORMATNEW_TYPE_TEXT  = 4 * AST_FORMATNEW_INC,
 };
 
 enum ast_format_id {
 	/*! G.723.1 compression */
-	AST_FORMATNEW_G723_1          = 1 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_G723_1			= 1 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! GSM compression */
-	AST_FORMATNEW_GSM             = 2 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_GSM				= 2 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! Raw mu-law data (G.711) */
-	AST_FORMATNEW_ULAW            = 3 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_ULAW				= 3 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! Raw A-law data (G.711) */
-	AST_FORMATNEW_ALAW            = 4 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_ALAW				= 4 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! ADPCM (G.726, 32kbps, AAL2 codeword packing) */
-	AST_FORMATNEW_G726_AAL2       = 5 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_G726_AAL2			= 5 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! ADPCM (IMA) */
-	AST_FORMATNEW_ADPCM           = 6 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_ADPCM				= 6 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! Raw 16-bit Signed Linear (8000 Hz) PCM */
-	AST_FORMATNEW_SLINEAR         = 7 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_SLINEAR			= 7 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! LPC10, 180 samples/frame */
-	AST_FORMATNEW_LPC10           = 8 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_LPC10				= 8 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! G.729A audio */
-	AST_FORMATNEW_G729A           = 9 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_G729A				= 9 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! SpeeX Free Compression */
-	AST_FORMATNEW_SPEEX           = 10 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_SPEEX				= 10 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! iLBC Free Compression */
-	AST_FORMATNEW_ILBC            = 11 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_ILBC				= 11 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! ADPCM (G.726, 32kbps, RFC3551 codeword packing) */
-	AST_FORMATNEW_G726            = 12 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_G726				= 12 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! G.722 */
-	AST_FORMATNEW_G722            = 13 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_G722				= 13 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! G.722.1 (also known as Siren7, 32kbps assumed) */
-	AST_FORMATNEW_SIREN7          = 14 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_SIREN7			= 14 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! G.722.1 Annex C (also known as Siren14, 48kbps assumed) */
-	AST_FORMATNEW_SIREN14         = 15 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_SIREN14			= 15 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! Raw 16-bit Signed Linear (16000 Hz) PCM */
-	AST_FORMATNEW_SLINEAR16       = 16 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_SLINEAR16			= 16 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! G.719 (64 kbps assumed) */
-	AST_FORMATNEW_G719	        = 17 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_G719				= 17 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! SpeeX Wideband (16kHz) Free Compression */
-	AST_FORMATNEW_SPEEX16         = 18 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_SPEEX16			= 18 + AST_FORMATNEW_TYPE_AUDIO,
 	/*! Raw mu-law data (G.711) */
-	AST_FORMATNEW_TESTLAW         = 19 + AST_FORMATNEW_TYPE_AUDIO,
+	AST_FORMATNEW_TESTLAW			= 19 + AST_FORMATNEW_TYPE_AUDIO,
 
 	/*! H.261 Video */
-	AST_FORMATNEW_H261            = 1 + AST_FORMATNEW_TYPE_VIDEO,
+	AST_FORMATNEW_H261				= 1 + AST_FORMATNEW_TYPE_VIDEO,
 	/*! H.263 Video */
-	AST_FORMATNEW_H263            = 2 + AST_FORMATNEW_TYPE_VIDEO,
+	AST_FORMATNEW_H263				= 2 + AST_FORMATNEW_TYPE_VIDEO,
 	/*! H.263+ Video */
-	AST_FORMATNEW_H263_PLUS       = 3 + AST_FORMATNEW_TYPE_VIDEO,
+	AST_FORMATNEW_H263_PLUS			= 3 + AST_FORMATNEW_TYPE_VIDEO,
 	/*! H.264 Video */
-	AST_FORMATNEW_H264            = 4 + AST_FORMATNEW_TYPE_VIDEO,
+	AST_FORMATNEW_H264				= 4 + AST_FORMATNEW_TYPE_VIDEO,
 	/*! MPEG4 Video */
-	AST_FORMATNEW_MP4_VIDEO       = 5 + AST_FORMATNEW_TYPE_VIDEO,
+	AST_FORMATNEW_MP4_VIDEO			= 5 + AST_FORMATNEW_TYPE_VIDEO,
 
 	/*! JPEG Images */
-	AST_FORMATNEW_JPEG            = 1 + AST_FORMATNEW_TYPE_IMAGE,
+	AST_FORMATNEW_JPEG				= 1 + AST_FORMATNEW_TYPE_IMAGE,
 	/*! PNG Images */
-	AST_FORMATNEW_PNG             = 2 + AST_FORMATNEW_TYPE_IMAGE,
+	AST_FORMATNEW_PNG				= 2 + AST_FORMATNEW_TYPE_IMAGE,
 
 	/*! T.140 RED Text format RFC 4103 */
-	AST_FORMATNEW_T140RED         = 1 + AST_FORMATNEW_TYPE_TEXT,
+	AST_FORMATNEW_T140RED			= 1 + AST_FORMATNEW_TYPE_TEXT,
 	/*! T.140 Text format - ITU T.140, RFC 4103 */
-	AST_FORMATNEW_T140            = 2 + AST_FORMATNEW_TYPE_TEXT,
+	AST_FORMATNEW_T140				= 2 + AST_FORMATNEW_TYPE_TEXT,
 };
 
 /*! Determine what type of media a ast_format_id is. */
@@ -113,15 +113,15 @@
 
 /*! \brief This structure contains the buffer used for format attributes */
 struct ast_format_attr {
-    uint8_t format_attr[AST_FORMATNEW_ATTR_SIZE];
+	uint8_t format_attr[AST_FORMATNEW_ATTR_SIZE];
 };
 
 /*! \brief Represents a media format within Asterisk. */
 struct ast_format {
-    /*! The unique id representing this format from all the other formats. */
-    enum ast_format_id id;
-    /*!  Attribute structure used to associate attributes with a format. */
-    struct ast_format_attr fattr;
+	/*! The unique id representing this format from all the other formats. */
+	enum ast_format_id id;
+	/*!  Attribute structure used to associate attributes with a format. */
+	struct ast_format_attr fattr;
 };
 
 enum ast_format_cmp_res {
@@ -135,25 +135,25 @@
 
 /*! \brief A format must register an attribute interface if it requires the use of the format attributes void pointer */
 struct ast_format_attr_interface {
-    /*! format type */
-    enum ast_format_id id;
-
-    /*! \brief Determine if format_attr 1 is a subset of format_attr 2.
-     *
-     * \retval ast_format_cmp_res representing the result of comparing fattr1 and fattr2.
+	/*! format type */
+	enum ast_format_id id;
+
+	/*! \brief Determine if format_attr 1 is a subset of format_attr 2.
+	 *
+	 * \retval ast_format_cmp_res representing the result of comparing fattr1 and fattr2.
 	 */
-    enum ast_format_cmp_res (* const format_attr_cmp)(struct ast_format_attr *fattr1, struct ast_format_attr *fattr2);
-
-    /*! \brief Get joint attributes of same format type if they exist.
-     *
-     * \retval 0 if joint attributes exist
-     * \retval -1 if no joint attributes are present
-     */
-    int (* const format_attr_get_joint)(struct ast_format_attr *fattr1, struct ast_format_attr *fattr2, struct ast_format_attr *result);
-
-    /*! \brief Set format capabilities from a list of key value pairs ending with AST_FORMAT_ATTR_END.
+	enum ast_format_cmp_res (* const format_attr_cmp)(struct ast_format_attr *fattr1, struct ast_format_attr *fattr2);
+
+	/*! \brief Get joint attributes of same format type if they exist.
+	 *
+	 * \retval 0 if joint attributes exist
+	 * \retval -1 if no joint attributes are present
+	 */
+	int (* const format_attr_get_joint)(struct ast_format_attr *fattr1, struct ast_format_attr *fattr2, struct ast_format_attr *result);
+
+	/*! \brief Set format capabilities from a list of key value pairs ending with AST_FORMAT_ATTR_END.
 	 * \note This function does not need to call va_end of the va_list. */
-    void (* const format_attr_set)(struct ast_format_attr *format_attr, va_list ap);
+	void (* const format_attr_set)(struct ast_format_attr *format_attr, va_list ap);
 };
 
 /*!
@@ -169,11 +169,11 @@
  * ast_format_set(format, AST_FORMATNEW_ULAW, 0); // no capability attributes are needed for ULAW
  *
  * ast_format_set(format, AST_FORMATNEW_SILK, 1, // SILK has capability attributes.
- *      AST_FORMATNEW_SILK_ATTR_RATE, 24000,
- *      AST_FORMATNEW_SILK_ATTR_RATE, 16000,
- *      AST_FORMATNEW_SILK_ATTR_RATE, 12000,
- *      AST_FORMATNEW_SILK_ATTR_RATE, 8000,
- *      AST_FORMATNEW_ATTR_END);
+ *	  AST_FORMATNEW_SILK_ATTR_RATE, 24000,
+ *	  AST_FORMATNEW_SILK_ATTR_RATE, 16000,
+ *	  AST_FORMATNEW_SILK_ATTR_RATE, 12000,
+ *	  AST_FORMATNEW_SILK_ATTR_RATE, 8000,
+ *	  AST_FORMATNEW_ATTR_END);
  *
  * \return Pointer to ast_format object, same pointer that is passed in
  * by the first argument.




More information about the asterisk-commits mailing list