Changeset 2438 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-codec/passthrough.c

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/src/pjmedia-codec/passthrough.c (modified) (5 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-codec/passthrough.c

@@ -460 +460 @@
                                     codec_desc[i].channel_count / 
                                     codec_desc[i].clock_rate);
-            attr->info.format.u32 = codec_desc[i].format.u32;
+            attr->info.format = codec_desc[i].format;
 
             /* Default flags. */
             attr->setting.frm_per_pkt = codec_desc[i].frm_per_pkt;
-            attr->setting.plc = 1;
+            attr->setting.plc = 0;
             attr->setting.penh= 0;
-            attr->setting.vad = 1;
+            attr->setting.vad = 0;
             attr->setting.cng = attr->setting.vad;
             attr->setting.dec_fmtp = codec_desc[i].dec_fmtp;
@@ -720 +720 @@
         frames[count].timestamp.u64 = ts->u64 + count*desc->samples_per_frame;
 
-        pkt = ((char*)pkt) + codec_data->avg_frame_size;
+        pkt = (pj_uint8_t*)pkt + codec_data->avg_frame_size;
         pkt_size -= codec_data->avg_frame_size;
 
@@ -800 +800 @@
     pjmedia_frame_ext *output_ = (pjmedia_frame_ext*) output;
 
-    /* Check if input is formatted in pjmedia_frame */
-    pj_assert(input && input->type == PJMEDIA_FRAME_TYPE_AUDIO);
+    pj_assert(input && input->size > 0);
 
 #if PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR
@@ -818 +817 @@
     }
 #endif
-
-    pj_bzero(output_, sizeof(pjmedia_frame_ext));
-    output_->base.type = PJMEDIA_FRAME_TYPE_EXTENDED;
-    
-    if (input && input->size > 0) {
-        PJ_ASSERT_RETURN(output_buf_len >= sizeof(pjmedia_frame_ext) +
-                                           sizeof(pjmedia_frame_ext_subframe) +
-                                           input->size,
-                         PJMEDIA_CODEC_EFRMTOOSHORT);
-
-        pjmedia_frame_ext_append_subframe(output_, input->buf, 
-                                          (pj_uint16_t)(input->size << 3),
-                                          (pj_uint16_t)desc->samples_per_frame);
-    }
+    /*
+    PJ_ASSERT_RETURN(output_buf_len >= sizeof(pjmedia_frame_ext) +
+                                       sizeof(pjmedia_frame_ext_subframe) +
+                                       input->size,
+                     PJMEDIA_CODEC_EFRMTOOSHORT);
+     */
+
+    pjmedia_frame_ext_append_subframe(output_, input->buf, 
+                                      (pj_uint16_t)(input->size << 3),
+                                      (pj_uint16_t)desc->samples_per_frame);
 
     return PJ_SUCCESS;
@@ -843 +838 @@
                                   struct pjmedia_frame *output)
 {
-    return codec_decode(codec, NULL, output_buf_len, output);
+    codec_private_t *codec_data = (codec_private_t*) codec->codec_data;
+    struct codec_desc *desc = &codec_desc[codec_data->codec_idx];
+    pjmedia_frame_ext *output_ = (pjmedia_frame_ext*) output;
+
+    PJ_UNUSED_ARG(output_buf_len);
+
+    pjmedia_frame_ext_append_subframe(output_, NULL, 0,
+                                      (pj_uint16_t)desc->samples_per_frame);
+
+    return PJ_SUCCESS;
 }