[svn-commits] rmudgett: branch rmudgett/iax_fracks r420062 - in /team/rmudgett/iax_fracks: ...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Aug  5 14:17:14 2014
New Revision: 420062

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420062
Log:
Revert -r420026 Removing Opus and VP8 format compatibility bit assignments.

Modified:
    team/rmudgett/iax_fracks/channels/iax2/format_compatibility.c
    team/rmudgett/iax_fracks/include/asterisk/format_compatibility.h
    team/rmudgett/iax_fracks/main/format_compatibility.c

Modified: team/rmudgett/iax_fracks/channels/iax2/format_compatibility.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/iax_fracks/channels/iax2/format_compatibility.c?view=diff&rev=420062&r1=420061&r2=420062
==============================================================================
--- team/rmudgett/iax_fracks/channels/iax2/format_compatibility.c (original)
+++ team/rmudgett/iax_fracks/channels/iax2/format_compatibility.c Tue Aug  5 14:17:14 2014
@@ -113,6 +113,8 @@
 		/*! Speex is free, but computationally more expensive than GSM */
 		AST_FORMAT_SPEEX16,
 		AST_FORMAT_SPEEX,
+		/*! Opus */
+		AST_FORMAT_OPUS,
 		/*! Ick, LPC10 sounds terrible, but at least we have code for it, if you're tacky enough
 		    to use it */
 		AST_FORMAT_LPC10,

Modified: team/rmudgett/iax_fracks/include/asterisk/format_compatibility.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/iax_fracks/include/asterisk/format_compatibility.h?view=diff&rev=420062&r1=420061&r2=420062
==============================================================================
--- team/rmudgett/iax_fracks/include/asterisk/format_compatibility.h (original)
+++ team/rmudgett/iax_fracks/include/asterisk/format_compatibility.h Tue Aug  5 14:17:14 2014
@@ -69,6 +69,8 @@
 #define AST_FORMAT_G719 (1ULL << 32)
 /*! SpeeX Wideband (16kHz) Free Compression */
 #define AST_FORMAT_SPEEX16 (1ULL << 33)
+/*! Opus audio (8kHz, 16kHz, 24kHz, 48Khz) */
+#define AST_FORMAT_OPUS (1ULL << 34)
 /*! Raw testing-law data (G.711) */
 #define AST_FORMAT_TESTLAW (1ULL << 47)
 /*! H.261 Video */
@@ -81,6 +83,8 @@
 #define AST_FORMAT_H264 (1ULL << 21)
 /*! MPEG4 Video */
 #define AST_FORMAT_MP4 (1ULL << 22)
+/*! VP8 Video */
+#define AST_FORMAT_VP8 (1ULL << 23)
 /*! JPEG Images */
 #define AST_FORMAT_JPEG (1ULL << 16)
 /*! PNG Images */

Modified: team/rmudgett/iax_fracks/main/format_compatibility.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/iax_fracks/main/format_compatibility.c?view=diff&rev=420062&r1=420061&r2=420062
==============================================================================
--- team/rmudgett/iax_fracks/main/format_compatibility.c (original)
+++ team/rmudgett/iax_fracks/main/format_compatibility.c Tue Aug  5 14:17:14 2014
@@ -76,6 +76,8 @@
 		return AST_FORMAT_G719;
 	} else if (ast_format_cmp(format, ast_format_speex16) == AST_FORMAT_CMP_EQUAL) {
 		return AST_FORMAT_SPEEX16;
+	} else if (ast_format_cmp(format, ast_format_opus) == AST_FORMAT_CMP_EQUAL) {
+		return AST_FORMAT_OPUS;
 	} else if (ast_format_cmp(format, ast_format_testlaw) == AST_FORMAT_CMP_EQUAL) {
 		return AST_FORMAT_TESTLAW;
 	} else if (ast_format_cmp(format, ast_format_h261) == AST_FORMAT_CMP_EQUAL) {
@@ -88,6 +90,8 @@
 		return AST_FORMAT_H264;
 	} else if (ast_format_cmp(format, ast_format_mp4) == AST_FORMAT_CMP_EQUAL) {
 		return AST_FORMAT_MP4;
+	} else if (ast_format_cmp(format, ast_format_vp8) == AST_FORMAT_CMP_EQUAL) {
+		return AST_FORMAT_VP8;
 	} else if (ast_format_cmp(format, ast_format_jpeg) == AST_FORMAT_CMP_EQUAL) {
 		return AST_FORMAT_JPEG;
 	} else if (ast_format_cmp(format, ast_format_png) == AST_FORMAT_CMP_EQUAL) {
@@ -139,6 +143,8 @@
 		return AST_FORMAT_G719;
 	} else if (codec->id == ast_format_get_codec_id(ast_format_speex16)) {
 		return AST_FORMAT_SPEEX16;
+	} else if (codec->id == ast_format_get_codec_id(ast_format_opus)) {
+		return AST_FORMAT_OPUS;
 	} else if (codec->id == ast_format_get_codec_id(ast_format_testlaw)) {
 		return AST_FORMAT_TESTLAW;
 	} else if (codec->id == ast_format_get_codec_id(ast_format_h261)) {
@@ -151,6 +157,8 @@
 		return AST_FORMAT_H264;
 	} else if (codec->id == ast_format_get_codec_id(ast_format_mp4)) {
 		return AST_FORMAT_MP4;
+	} else if (codec->id == ast_format_get_codec_id(ast_format_vp8)) {
+		return AST_FORMAT_VP8;
 	} else if (codec->id == ast_format_get_codec_id(ast_format_jpeg)) {
 		return AST_FORMAT_JPEG;
 	} else if (codec->id == ast_format_get_codec_id(ast_format_png)) {
@@ -221,6 +229,9 @@
 	/*! SpeeX Wideband (16kHz) Free Compression */
 	case AST_FORMAT_SPEEX16:
 		return ast_format_speex16;
+	/*! Opus audio (8kHz, 16kHz, 24kHz, 48Khz) */
+	case AST_FORMAT_OPUS:
+		return ast_format_opus;
 	/*! Raw mu-law data (G.711) */
 	case AST_FORMAT_TESTLAW:
 		return ast_format_testlaw;
@@ -240,6 +251,9 @@
 	/*! MPEG4 Video */
 	case AST_FORMAT_MP4:
 		return ast_format_mp4;
+	/*! VP8 Video */
+	case AST_FORMAT_VP8:
+		return ast_format_vp8;
 
 	/*! JPEG Images */
 	case AST_FORMAT_JPEG: