Changeset 2436

Timestamp:

Jan 29, 2009 8:06:28 PM (14 years ago)

Author:

nanang

Message:

• Added pjmedia passthrough codec.
• Added field format in codec param info.
• Updated pjmedia_frame_ext_get_subframe to have index range checking.
• Added API docs on pjmedia_frame_ext routines.

Location:

pjproject/branches/projects/aps-direct/pjmedia

Files:

• include/pjmedia-codec/config.h (modified) (1 diff)
• include/pjmedia-codec/passthrough.h (added)
• include/pjmedia/codec.h (modified) (1 diff)
• include/pjmedia/port.h (modified) (2 diffs)
• src/pjmedia-codec/passthrough.c (added)

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia-codec/config.h

@@ -204 +204 @@
 #endif
 
+#ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR
+#   define PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR    1
+#endif
+
+#ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_G729
+#   define PJMEDIA_HAS_PASSTHROUGH_CODEC_G729   1
+#endif
+
+#ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC
+#   define PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC   1
+#endif
+
+#ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU
+#   define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU   1
+#endif
+
+#ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_G729
+#   define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA   1
+#endif
+
 #endif  /* __PJMEDIA_CODEC_CONFIG_H__ */

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/codec.h

@@ -276 +276 @@
        pj_uint8_t  pcm_bits_per_sample; /**< Bits/sample in the PCM side    */
        pj_uint8_t  pt;                  /**< Payload type.                  */
+       pjmedia_fourcc format;           /**< Source format, it's format of
+                                             encoder input and decoder 
+                                             output.                        */
     } info;
 

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/port.h

@@ -285 +285 @@
 
 
-/* Append one subframe to the frame_ext */
+/**
+ * Append one subframe to #pjmedia_frame_ext.
+ *
+ * @param frm               The #pjmedia_frame_ext.
+ * @param src               Subframe data.
+ * @param bitlen            Lenght of subframe, in bits.
+ * @param samples_cnt       Number of audio samples in subframe.
+ */
 PJ_INLINE(void) pjmedia_frame_ext_append_subframe(pjmedia_frame_ext *frm,
                                                   const void *src,
@@ -311 +318 @@
 }
 
-/* Get the pointer and length of the n-th subframe */
+/**
+ * Get a subframe from #pjmedia_frame_ext.
+ *
+ * @param frm               The #pjmedia_frame_ext.
+ * @param n                 Subframe index, zero based.
+ *
+ * @return                  The n-th subframe, or NULL if n is out-of-range.
+ */
 PJ_INLINE(pjmedia_frame_ext_subframe*) 
           pjmedia_frame_ext_get_subframe(const pjmedia_frame_ext *frm,
                                          unsigned n)
 {
-    pj_uint8_t *p;
-    unsigned i;
-    pjmedia_frame_ext_subframe *tmp;
-
-    pj_assert(n < frm->subframe_cnt);
-
-    p = (pj_uint8_t*)frm + sizeof(pjmedia_frame_ext);
-    for (i = 0; i < n; ++i) {   
-        tmp = (pjmedia_frame_ext_subframe*) p;
-        p += tmp->bitlen / 8;
-        if (tmp->bitlen % 8)
-            ++p;
+    pjmedia_frame_ext_subframe *sf = NULL;
+
+    if (n < frm->subframe_cnt) {
+        pj_uint8_t *p;
+        unsigned i;
+
+        p = (pj_uint8_t*)frm + sizeof(pjmedia_frame_ext);
+        for (i = 0; i < n; ++i) {       
+            sf = (pjmedia_frame_ext_subframe*) p;
+            p += sf->bitlen / 8;
+            if (sf->bitlen % 8)
+                ++p;
+        }
+        
+        sf = (pjmedia_frame_ext_subframe*) p;
     }
-    
-    tmp = (pjmedia_frame_ext_subframe*) p;
-    return tmp;
+
+    return sf;
 }