[asterisk-commits] kmoore: branch group/media_formats-reviewed-trunk r418252 - in /team/group/me...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Jul 9 13:39:33 CDT 2014


Author: kmoore
Date: Wed Jul  9 13:39:28 2014
New Revision: 418252

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418252
Log:
Fix build issues on newer gcc

Modified:
    team/group/media_formats-reviewed-trunk/channels/chan_sip.c
    team/group/media_formats-reviewed-trunk/codecs/codec_resample.c
    team/group/media_formats-reviewed-trunk/main/codec.c
    team/group/media_formats-reviewed-trunk/main/codec_builtin.c
    team/group/media_formats-reviewed-trunk/main/translate.c
    team/group/media_formats-reviewed-trunk/main/utils.c
    team/group/media_formats-reviewed-trunk/res/res_format_attr_celt.c
    team/group/media_formats-reviewed-trunk/res/res_format_attr_h263.c
    team/group/media_formats-reviewed-trunk/res/res_rtp_asterisk.c

Modified: team/group/media_formats-reviewed-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/channels/chan_sip.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/channels/chan_sip.c (original)
+++ team/group/media_formats-reviewed-trunk/channels/chan_sip.c Wed Jul  9 13:39:28 2014
@@ -12966,7 +12966,7 @@
 		ast_str_append(a_buf, 0, "a=fmtp:%d annexa=no\r\n", rtp_code);
 	} else if (ast_format_cmp(format, ast_format_ilbc) == AST_FORMAT_CMP_EQUAL) {
 		/* Add information about us using only 20/30 ms packetization */
-		ast_str_append(a_buf, 0, "a=fmtp:%d mode=%d\r\n", rtp_code, framing);
+		ast_str_append(a_buf, 0, "a=fmtp:%d mode=%u\r\n", rtp_code, framing);
 	} else if (ast_format_cmp(format, ast_format_siren7) == AST_FORMAT_CMP_EQUAL) {
 		/* Indicate that we only expect 32Kbps */
 		ast_str_append(a_buf, 0, "a=fmtp:%d bitrate=32000\r\n", rtp_code);

Modified: team/group/media_formats-reviewed-trunk/codecs/codec_resample.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/codecs/codec_resample.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/codecs/codec_resample.c (original)
+++ team/group/media_formats-reviewed-trunk/codecs/codec_resample.c Wed Jul  9 13:39:28 2014
@@ -169,7 +169,7 @@
 			translators[idx].buf_size = OUTBUF_SIZE;
 			memcpy(&translators[idx].src_codec, &codec_list[x], sizeof(struct ast_codec));
 			memcpy(&translators[idx].dst_codec, &codec_list[y], sizeof(struct ast_codec));
-			snprintf(translators[idx].name, sizeof(translators[idx].name), "slin %dkhz -> %dkhz",
+			snprintf(translators[idx].name, sizeof(translators[idx].name), "slin %ukhz -> %ukhz",
 				translators[idx].src_codec.sample_rate, translators[idx].dst_codec.sample_rate);
 			res |= ast_register_translator(&translators[idx]);
 			idx++;

Modified: team/group/media_formats-reviewed-trunk/main/codec.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/main/codec.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/main/codec.c (original)
+++ team/group/media_formats-reviewed-trunk/main/codec.c Wed Jul  9 13:39:28 2014
@@ -269,7 +269,7 @@
 
 	codec_new = ao2_find(codecs, codec, OBJ_SEARCH_OBJECT | OBJ_NOLOCK);
 	if (codec_new) {
-		ast_log(LOG_ERROR, "A codec with name '%s' of type '%s' and sample rate '%d' is already registered\n",
+		ast_log(LOG_ERROR, "A codec with name '%s' of type '%s' and sample rate '%u' is already registered\n",
 			codec->name, ast_codec_media_type2str(codec->type), codec->sample_rate);
 		ao2_ref(codec_new, -1);
 		return -1;
@@ -277,7 +277,7 @@
 
 	codec_new = ao2_alloc_options(sizeof(*codec_new), NULL, AO2_ALLOC_OPT_LOCK_NOLOCK);
 	if (!codec_new) {
-		ast_log(LOG_ERROR, "Could not allocate a codec with name '%s' of type '%s' and sample rate '%d'\n",
+		ast_log(LOG_ERROR, "Could not allocate a codec with name '%s' of type '%s' and sample rate '%u'\n",
 			codec->name, ast_codec_media_type2str(codec->type), codec->sample_rate);
 		return -1;
 	}
@@ -289,7 +289,7 @@
 	/* Once registered a codec can not be unregistered, and the module must persist */
 	ast_module_ref(mod);
 
-	ast_verb(2, "Registered '%s' codec '%s' at sample rate '%d' with id '%d'\n",
+	ast_verb(2, "Registered '%s' codec '%s' at sample rate '%u' with id '%u'\n",
 		ast_codec_media_type2str(codec->type), codec->name, codec->sample_rate, codec_new->id);
 
 	ao2_ref(codec_new, -1);

Modified: team/group/media_formats-reviewed-trunk/main/codec_builtin.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/main/codec_builtin.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/main/codec_builtin.c (original)
+++ team/group/media_formats-reviewed-trunk/main/codec_builtin.c Wed Jul  9 13:39:28 2014
@@ -65,7 +65,7 @@
 		return 20;
 		break;
 	default:
-		ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", type);
+		ast_log(LOG_WARNING, "Badly encoded frame (%u)\n", type);
 	}
 	return -1;
 }

Modified: team/group/media_formats-reviewed-trunk/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/main/translate.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/main/translate.c (original)
+++ team/group/media_formats-reviewed-trunk/main/translate.c Wed Jul  9 13:39:28 2014
@@ -826,7 +826,7 @@
 static void codec_append_name(const struct ast_codec *codec, struct ast_str **buf)
 {
 	if (codec) {
-		ast_str_append(buf, 0, "(%s@%d)", codec->name, codec->sample_rate);
+		ast_str_append(buf, 0, "(%s@%u)", codec->name, codec->sample_rate);
 	} else {
 		ast_str_append(buf, 0, "(nothing)");
 	}
@@ -992,7 +992,7 @@
 	}
 
 	AST_RWLIST_RDLOCK(&translators);
-	ast_cli(a->fd, "--- Translation paths SRC Codec \"%s\" sample rate %d ---\n",
+	ast_cli(a->fd, "--- Translation paths SRC Codec \"%s\" sample rate %u ---\n",
 		codec_name, src_codec->sample_rate);
 
 	while ((dst_codec = ast_codec_get_by_id(i))) {
@@ -1031,8 +1031,8 @@
 			}
 		}
 
-		snprintf(src_buffer, sizeof(src_buffer), "%s:%d", src_codec->name, src_codec->sample_rate);
-		snprintf(dst_buffer, sizeof(dst_buffer), "%s:%d", dst_codec->name, dst_codec->sample_rate);
+		snprintf(src_buffer, sizeof(src_buffer), "%s:%u", src_codec->name, src_codec->sample_rate);
+		snprintf(dst_buffer, sizeof(dst_buffer), "%s:%u", dst_codec->name, dst_codec->sample_rate);
 		ast_cli(a->fd, "\t%-16.16s To %-16.16s: %-60.60s\n",
 			src_buffer, dst_buffer, ast_str_buffer(str));
 		ast_str_reset(str);

Modified: team/group/media_formats-reviewed-trunk/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/main/utils.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/main/utils.c (original)
+++ team/group/media_formats-reviewed-trunk/main/utils.c Wed Jul  9 13:39:28 2014
@@ -1054,10 +1054,10 @@
 			if (!header_printed) {
 				if (lock_info->lwp != -1) {
 					ast_str_append(&str, 0, "=== Thread ID: 0x%lx LWP:%d (%s)\n",
-						(long) lock_info->thread_id, lock_info->lwp, lock_info->thread_name);
+						(long unsigned) lock_info->thread_id, lock_info->lwp, lock_info->thread_name);
 				} else {
 					ast_str_append(&str, 0, "=== Thread ID: 0x%lx (%s)\n",
-						(long) lock_info->thread_id, lock_info->thread_name);
+						(long unsigned) lock_info->thread_id, lock_info->thread_name);
 				}
 				header_printed = 1;
 			}

Modified: team/group/media_formats-reviewed-trunk/res/res_format_attr_celt.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/res/res_format_attr_celt.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/res/res_format_attr_celt.c (original)
+++ team/group/media_formats-reviewed-trunk/res/res_format_attr_celt.c Wed Jul  9 13:39:28 2014
@@ -97,7 +97,7 @@
 		return;
 	}
 
-	ast_str_append(str, 0, "a=fmtp:%d framesize=%d\r\n", payload, attr->framesize);
+	ast_str_append(str, 0, "a=fmtp:%u framesize=%u\r\n", payload, attr->framesize);
 }
 
 static enum ast_format_cmp_res celt_cmp(const struct ast_format *format1, const struct ast_format *format2)

Modified: team/group/media_formats-reviewed-trunk/res/res_format_attr_h263.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/res/res_format_attr_h263.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/res/res_format_attr_h263.c (original)
+++ team/group/media_formats-reviewed-trunk/res/res_format_attr_h263.c Wed Jul  9 13:39:28 2014
@@ -212,7 +212,7 @@
 		return;
 	}
 
-	ast_str_append(str, 0, "a=fmtp:%d SQCIF=%u;QCIF=%u;CIF=%u;CIF4=%u;CIF16=%u;VGA=%u;F=%u;I=%u;J=%u;T=%u;K=%u;N=%u;BPP=%u;HRD=%u",
+	ast_str_append(str, 0, "a=fmtp:%u SQCIF=%u;QCIF=%u;CIF=%u;CIF4=%u;CIF16=%u;VGA=%u;F=%u;I=%u;J=%u;T=%u;K=%u;N=%u;BPP=%u;HRD=%u",
 		payload, attr->SQCIF, attr->QCIF, attr->CIF, attr->CIF4, attr->CIF16, attr->VGA, attr->F, attr->I, attr->J,
 		attr->T, attr->K, attr->N, attr->BPP, attr->HRD);
 

Modified: team/group/media_formats-reviewed-trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/res/res_rtp_asterisk.c?view=diff&rev=418252&r1=418251&r2=418252
==============================================================================
--- team/group/media_formats-reviewed-trunk/res/res_rtp_asterisk.c (original)
+++ team/group/media_formats-reviewed-trunk/res/res_rtp_asterisk.c Wed Jul  9 13:39:28 2014
@@ -3079,7 +3079,7 @@
 		if (framing_ms) {
 			rtp->smoother = ast_smoother_new((framing_ms * ast_format_get_minimum_bytes(format)) / ast_format_get_minimum_ms(format));
 			if (!rtp->smoother) {
-				ast_log(LOG_WARNING, "Unable to create smoother: format %s ms: %d len: %d\n",
+				ast_log(LOG_WARNING, "Unable to create smoother: format %s ms: %u len: %u\n",
 					ast_format_get_name(format), framing_ms, ast_format_get_minimum_bytes(format));
 				return -1;
 			}




More information about the asterisk-commits mailing list