Changeset 3667 for pjproject/trunk/pjmedia/src/pjmedia/format.c

Timestamp:

Jul 19, 2011 11:11:07 AM (13 years ago)

Author:

nanang

Message:

Fixed #1271: protected all video features with PJMEDIA_HAS_VIDEO macro setting.

File:

• pjproject/trunk/pjmedia/src/pjmedia/format.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/format.c

@@ -24 +24 @@
 #include <pj/string.h>
 
+
+PJ_DEF(void) pjmedia_format_init_audio( pjmedia_format *fmt,
+                                        pj_uint32_t fmt_id,
+                                        unsigned clock_rate,
+                                        unsigned channel_count,
+                                        unsigned bits_per_sample,
+                                        unsigned frame_time_usec,
+                                        pj_uint32_t avg_bps,
+                                        pj_uint32_t max_bps)
+{
+    fmt->id = fmt_id;
+    fmt->type = PJMEDIA_TYPE_AUDIO;
+    fmt->detail_type = PJMEDIA_FORMAT_DETAIL_AUDIO;
+
+    fmt->det.aud.clock_rate = clock_rate;
+    fmt->det.aud.channel_count = channel_count;
+    fmt->det.aud.bits_per_sample = bits_per_sample;
+    fmt->det.aud.frame_time_usec = frame_time_usec;
+    fmt->det.aud.avg_bps = avg_bps;
+    fmt->det.aud.max_bps = max_bps;
+}
+
+
+PJ_DEF(pjmedia_audio_format_detail*)
+pjmedia_format_get_audio_format_detail(const pjmedia_format *fmt,
+                                       pj_bool_t assert_valid)
+{
+    if (fmt->detail_type==PJMEDIA_FORMAT_DETAIL_AUDIO) {
+        return (pjmedia_audio_format_detail*) &fmt->det.aud;
+    } else {
+        pj_assert(!assert_valid || !"Invalid audio format detail");
+        return NULL;
+    }
+}
+
+
+PJ_DEF(pjmedia_format*) pjmedia_format_copy(pjmedia_format *dst,
+                                            const pjmedia_format *src)
+{
+    return (pjmedia_format*)pj_memcpy(dst, src, sizeof(*src));
+}
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 static pj_status_t apply_packed_fmt(const pjmedia_video_format_info *fi,
                                     pjmedia_video_apply_fmt_param *aparam);
@@ -57 +103 @@
 };
 
-
-PJ_DEF(void) pjmedia_format_init_audio( pjmedia_format *fmt,
-                                        pj_uint32_t fmt_id,
-                                        unsigned clock_rate,
-                                        unsigned channel_count,
-                                        unsigned bits_per_sample,
-                                        unsigned frame_time_usec,
-                                        pj_uint32_t avg_bps,
-                                        pj_uint32_t max_bps)
-{
-    fmt->id = fmt_id;
-    fmt->type = PJMEDIA_TYPE_AUDIO;
-    fmt->detail_type = PJMEDIA_FORMAT_DETAIL_AUDIO;
-
-    fmt->det.aud.clock_rate = clock_rate;
-    fmt->det.aud.channel_count = channel_count;
-    fmt->det.aud.bits_per_sample = bits_per_sample;
-    fmt->det.aud.frame_time_usec = frame_time_usec;
-    fmt->det.aud.avg_bps = avg_bps;
-    fmt->det.aud.max_bps = max_bps;
-}
-
 PJ_DEF(void) pjmedia_format_init_video( pjmedia_format *fmt,
                                         pj_uint32_t fmt_id,
@@ -113 +137 @@
 }
 
-PJ_DEF(pjmedia_audio_format_detail*)
-pjmedia_format_get_audio_format_detail(const pjmedia_format *fmt,
-                                       pj_bool_t assert_valid)
-{
-    if (fmt->detail_type==PJMEDIA_FORMAT_DETAIL_AUDIO) {
-        return (pjmedia_audio_format_detail*) &fmt->det.aud;
-    } else {
-        pj_assert(!assert_valid || !"Invalid audio format detail");
-        return NULL;
-    }
-}
-
 PJ_DEF(pjmedia_video_format_detail*)
 pjmedia_format_get_video_format_detail(const pjmedia_format *fmt,
@@ -135 +147 @@
         return NULL;
     }
-}
-
-PJ_DEF(pjmedia_format*) pjmedia_format_copy(pjmedia_format *dst,
-                                            const pjmedia_format *src)
-{
-    return (pjmedia_format*)pj_memcpy(dst, src, sizeof(*src));
 }
 
@@ -365 +371 @@
 }
 
+#endif /* PJMEDIA_HAS_VIDEO */