Changeset 3606 for pjproject/branches/projects/2.0-dev

Timestamp:

Jul 7, 2011 7:34:26 AM (13 years ago)

Author:

bennylp

Message:

Misc (re #1320): added pjmedia_type_name() API

Location:

pjproject/branches/projects/2.0-dev/pjmedia

Files:

• build/Makefile (modified) (1 diff)
• include/pjmedia/types.h (modified) (2 diffs)
• src/pjmedia/types.c (modified) (1 diff)

pjproject/branches/projects/2.0-dev/pjmedia/build/Makefile

@@ -66 +66 @@
                         sound_legacy.o sound_port.o stereo_port.o \
                         stream_common.o stream.o tonegen.o transport_adapter_sample.o \
-                        transport_ice.o transport_loop.o \
-                        transport_srtp.o transport_udp.o vid_codec.o vid_codec_util.o \
+                        transport_ice.o transport_loop.o transport_srtp.o transport_udp.o \
+                        types.o vid_codec.o vid_codec_util.o \
                         videoport.o vid_stream.o \
                         wav_player.o wav_playlist.o wav_writer.o wave.o \

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/types.h

@@ -50 +50 @@
 
 /**
- * Top most media type.
+ * Top most media type. See also #pjmedia_type_name().
  */
 typedef enum pjmedia_type
@@ -193 +193 @@
 
 
+/**
+ * Utility function to return the string name for a pjmedia_type.
+ *
+ * @param t             The media type.
+ *
+ * @return              String.
+ */
+PJ_DECL(const char*) pjmedia_type_name(pjmedia_type t);
 
 /**

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/types.c

@@ -18 +18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <pjmedia/frame.h>
-#include <pjmedia/port.h>
 #include <pjmedia/types.h>
-#include <pj/pool.h>
+#include <pj/assert.h>
 
+/**
+ * Utility function to return the string name for a pjmedia_type.
+ *
+ * @param t             The media type.
+ *
+ * @return              String.
+ */
+PJ_DEF(const char*) pjmedia_type_name(pjmedia_type t)
+{
+    const char *type_names[] = {
+        "none",
+        "audio",
+        "video",
+        "application",
+        "unknown"
+    };
+
+    pj_assert(t < PJ_ARRAY_SIZE(type_names));
+    pj_assert(PJMEDIA_TYPE_UNKNOWN == 4);
+
+    if (t < PJ_ARRAY_SIZE(type_names))
+        return type_names[t];
+    else
+        return "??";
+}