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

Timestamp:

Feb 5, 2009 10:59:14 AM (15 years ago)

Author:

nanang

Message:

• Added new API for sound & sound port to create/open sound device with extended setting, to allow opening sound device with non-PCM format and other settings.
• Updated symbian_ua/ua.cpp to be able to reopen sound device when audio stream session is using non-PCM data/passthrough codec.
• Updated stream.c to allow it works with non-PCM data.
• Added PCMU/A frames processing into non-PCM play/record callbacks in symbian_audio_aps.cpp.
• Added passthrough codec init/deinitialization in pjsua-lib.
• Added a new pjmedia_frame_ext helper function, pjmedia_frame_ext_pop_subframes, to pop-out/remove some subframes.
• Other minor updates/fixes.

File:

• pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/port.h (modified) (1 diff)

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

@@ -360 +360 @@
         
 /**
+ * Pop out first n subframes from #pjmedia_frame_ext.
+ *
+ * @param frm               The #pjmedia_frame_ext.
+ * @param n                 Number of first subframes to be popped out.
+ *
+ * @return                  PJ_SUCCESS, or PJ_ENOTFOUND if frame is empty.
+ */
+PJ_INLINE(pj_status_t) 
+          pjmedia_frame_ext_pop_subframes(pjmedia_frame_ext *frm, unsigned n)
+{
+    pjmedia_frame_ext_subframe *sf;
+    pj_uint8_t *move_src;
+    unsigned move_len;
+
+    if (frm->subframe_cnt <= n) {
+        frm->subframe_cnt = 0;
+        frm->samples_cnt = 0;
+        return PJ_SUCCESS;
+    }
+
+    move_src = (pj_uint8_t*)pjmedia_frame_ext_get_subframe(frm, n);
+    sf = pjmedia_frame_ext_get_subframe(frm, frm->subframe_cnt-1);
+    move_len = (pj_uint8_t*)sf - move_src + sf->bitlen/8;
+    if (sf->bitlen % 8 != 0)
+        ++move_len;
+    pj_memmove((pj_uint8_t*)frm+sizeof(pjmedia_frame_ext), 
+               move_src, move_len);
+            
+    frm->samples_cnt = (pj_uint16_t)
+                   (frm->samples_cnt - n*frm->samples_cnt/frm->subframe_cnt);
+    frm->subframe_cnt = (pj_uint16_t) (frm->subframe_cnt - n);
+
+    return PJ_SUCCESS;
+}
+        
+/**
  * Port interface.
  */