[Asterisk-code-review] stream.c: Added 2 more debugging utils and added pos to stream string (asterisk[18])

[Friendly Automation]

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/14740 )

Change subject: stream.c:  Added 2 more debugging utils and added pos to stream string
......................................................................

stream.c:  Added 2 more debugging utils and added pos to stream string

 * Added ast_stream_to_stra and ast_stream_topology_to_stra() macros
   which are shortcuts for
      ast_str_tmp(256, ast_stream_to_str(stream, &STR_TMP))

 * Added the stream position to the string representation of the
   stream.

 * Fixed some formatting in ast_stream_to_str().

Change-Id: Idaf4cb0affa46d4dce58a73a111f35435331cc4b
---
M include/asterisk/stream.h
M main/stream.c
2 files changed, 28 insertions(+), 1 deletion(-)

Approvals:
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/include/asterisk/stream.h b/include/asterisk/stream.h
index ca637be..205feeb 100644
--- a/include/asterisk/stream.h
+++ b/include/asterisk/stream.h
@@ -474,6 +474,19 @@
 const char *ast_stream_to_str(const struct ast_stream *stream, struct ast_str **buf);
 
 /*!
+ * \brief Get a stack allocated string representing the stream for debugging/display purposes
+ *
+ * \param stream A stream
+ *
+ * \returns a stack allocated pointer to a string representing the stream.
+ *
+ * \warning No attempt should ever be made to free the returned
+ * char* as it is allocated from the stack.
+ *
+ */
+#define ast_stream_to_stra(__stream) ast_str_tmp(128, ast_stream_to_str(__stream, &STR_TMP))
+
+/*!
  * \brief Get the count of the current negotiated formats of a stream
  *
  * \param stream The media stream
@@ -954,4 +967,17 @@
 	struct ast_stream_codec_negotiation_prefs *prefs,
 	struct ast_str **error_message);
 
+/*!
+ * \brief Get a stack allocated string representing the topology for debugging/display purposes
+ *
+ * \param topology A topology
+ *
+ * \returns a stack allocated pointer to a string representing the topology.
+ *
+ * \warning No attempt should ever be made to free the returned
+ * char* as it is allocated from the stack.
+ *
+ */
+#define ast_stream_topology_to_stra(__topology) ast_str_tmp(256, ast_stream_topology_to_str(__topology, &STR_TMP))
+
 #endif /* _AST_STREAM_H */
diff --git a/main/stream.c b/main/stream.c
index 01b07ca..c97ae48 100644
--- a/main/stream.c
+++ b/main/stream.c
@@ -343,7 +343,8 @@
 		return ast_str_buffer(*buf);
 	}
 
-	ast_str_append(buf, 0, "%s:%s:%s ",
+	ast_str_append(buf, 0, "%d:%s:%s:%s ",
+		stream->position,
 		S_OR(stream->name, "noname"),
 		ast_codec_media_type2str(stream->type),
 		ast_stream_state_map[stream->state]);

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/14740
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 18
Gerrit-Change-Id: Idaf4cb0affa46d4dce58a73a111f35435331cc4b
Gerrit-Change-Number: 14740
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200824/f9775eba/attachment-0001.html>