Changeset 3116 for pjproject

Timestamp:

Mar 4, 2010 3:47:25 PM (15 years ago)

Author:

nanang

Message:

Ticket #1008:

• Applied VAS AMR playback solution from Forum Nokia.
• Fixed AMR playback for VAS and APS in composing DTX/NO_DATA (frame type 15) frame header.
• Modified symbsndtest test application to support non-PCM audio.
• Minor check fix in pjmedia_codec_mgr_destroy(), caught assertion when VAS factory init failed and media endpoint tried to destroy codec manager (codec mgr hasn't been init-ed).

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp (modified) (2 diffs)
• pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp (modified) (11 diffs)
• pjmedia/src/pjmedia/codec.c (modified) (1 diff)
• pjsip-apps/src/symsndtest/app_main.cpp (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

@@ -1035 +1035 @@
                     buf.iBuffer.Append((TUint8*)sf->data, len);
                 } else {
-                    buf.iBuffer.Append(0);
+                    enum {NO_DATA_FT = 15 };
+                    pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3);
+
+                    buf.iBuffer.Append(amr_header);
                 }
 
@@ -1041 +1044 @@
             
             } else { /* PJMEDIA_FRAME_TYPE_NONE */
-                buf.iBuffer.Append(0);
-                
+                enum {NO_DATA_FT = 15 };
+                pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3);
+
+                buf.iBuffer.Append(amr_header);
+
                 frame->samples_cnt = 0;
                 frame->subframe_cnt = 0;

pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp

@@ -416 +416 @@
 TInt CPjAudioEngine::StartPlay()
 {
-    TInt err;
+    TInt err = KErrNone;
     
     pj_assert(iVoIPDnlink);
@@ -429 +429 @@
             err = g711dec_if->SetMode((CVoIPFormatIntfc::TG711CodecMode)
                                       setting_.mode);
-            pj_assert(err == KErrNone);
         }
         break;
@@ -439 +438 @@
             err = ilbcdec_if->SetMode((CVoIPFormatIntfc::TILBCCodecMode)
                                       setting_.mode);
-            pj_assert(err == KErrNone);
-        }
-        break;
-
+        }
+        break;
+
+    case EAMR_NB:
+        /* Ticket #1008: AMR playback issue on few devices, e.g: E72, E52 */
+        err = dec_fmt_if->SetFrameMode(ETrue);
+        break;
+        
     default:
         break;
     }
+
+    if (err != KErrNone)
+        goto on_return;
     
     /* Configure audio routing */
@@ -452 +458 @@
     /* Start player */
     err = iVoIPDnlink->Start();
-    
+
+on_return:
     if (err == KErrNone) {
         dn_state_ = STATE_STREAMING;
@@ -465 +472 @@
 TInt CPjAudioEngine::StartRec()
 {
-    TInt err;
+    TInt err = KErrNone;
     
     pj_assert(iVoIPUplink);
@@ -478 +485 @@
             err = g711enc_if->SetMode((CVoIPFormatIntfc::TG711CodecMode)
                                       setting_.mode);
-            pj_assert(err == KErrNone);
         }
         break;
@@ -488 +494 @@
             err = ilbcenc_if->SetMode((CVoIPFormatIntfc::TILBCCodecMode)
                                       setting_.mode);
-            pj_assert(err == KErrNone);
         }
         break;
         
     case EAMR_NB:
-        enc_fmt_if->SetBitRate(setting_.mode);
+        err = enc_fmt_if->SetBitRate(setting_.mode);
         break;
         
@@ -499 +504 @@
         break;
     }
+    
+    if (err != KErrNone)
+        goto on_return;
     
     /* Configure general codec setting */
@@ -505 +513 @@
     /* Start recorder */
     err = iVoIPUplink->Start();
-    
+
+on_return:
     if (err == KErrNone) {
         up_state_ = STATE_STREAMING;
@@ -1113 +1122 @@
                     buffer.Append((TUint8*)sf->data, len);
                 } else {
-                    buffer.Append(0);
+                    enum {NO_DATA_FT = 15 };
+                    pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3);
+
+                    buffer.Append(amr_header);
                 }
 
@@ -1119 +1131 @@
             
             } else { /* PJMEDIA_FRAME_TYPE_NONE */
-                buffer.Append(0);
+                enum {NO_DATA_FT = 15 };
+                pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3);
+
+                buffer.Append(amr_header);
                 
                 frame->samples_cnt = 0;

pjproject/trunk/pjmedia/src/pjmedia/codec.c

@@ -86 +86 @@
 
     /* Destroy mutex */
-    pj_mutex_destroy(mgr->mutex);
+    if (mgr->mutex)
+        pj_mutex_destroy(mgr->mutex);
 
     /* Release pool */
-    pj_pool_release(mgr->pool);
+    if (mgr->pool)
+        pj_pool_release(mgr->pool);
 
     /* Just for safety, set codec manager states to zero */

pjproject/trunk/pjsip-apps/src/symsndtest/app_main.cpp

@@ -41 +41 @@
 static unsigned rec_cnt, play_cnt;
 static pj_time_val t_start;
-
-pj_pool_t *pool;
-pjmedia_delay_buf *delaybuf;
+static pjmedia_aud_param param;
+static pj_pool_t *pool;
+static pjmedia_delay_buf *delaybuf;
+static char frame_buf[256];
+
+static void copy_frame_ext(pjmedia_frame_ext *f_dst, 
+                           const pjmedia_frame_ext *f_src) 
+{
+    pj_bzero(f_dst, sizeof(*f_dst));
+    if (f_src->subframe_cnt) {
+        f_dst->base.type = PJMEDIA_FRAME_TYPE_EXTENDED;
+        for (unsigned i = 0; i < f_src->subframe_cnt; ++i) {
+            pjmedia_frame_ext_subframe *sf;
+            sf = pjmedia_frame_ext_get_subframe(f_src, i);
+            pjmedia_frame_ext_append_subframe(f_dst, sf->data, sf->bitlen, 
+                                              param.samples_per_frame);
+        }
+    } else {
+        f_dst->base.type = PJMEDIA_FRAME_TYPE_NONE;
+    }
+}
 
 /* Logging callback */
@@ -138 +156 @@
     PJ_UNUSED_ARG(user_data);
 
-    pjmedia_delay_buf_put(delaybuf, (pj_int16_t*)frame->buf);
-
-    if (frame->size != SAMPLES_PER_FRAME*2) {
-                PJ_LOG(3, (THIS_FILE, "Size captured = %u",
-                           frame->size));
+    if (param.ext_fmt.id == PJMEDIA_FORMAT_PCM) {
+        pjmedia_delay_buf_put(delaybuf, (pj_int16_t*)frame->buf);
+    
+        if (frame->size != SAMPLES_PER_FRAME*2) {
+                    PJ_LOG(3, (THIS_FILE, "Size captured = %u",
+                               frame->size));
+        }
+    } else {
+        pjmedia_frame_ext *f_src = (pjmedia_frame_ext*)frame;
+        pjmedia_frame_ext *f_dst = (pjmedia_frame_ext*)frame_buf;
+        
+        copy_frame_ext(f_dst, f_src);
     }
 
@@ -155 +180 @@
     PJ_UNUSED_ARG(user_data);
 
-    pjmedia_delay_buf_get(delaybuf, (pj_int16_t*)frame->buf);
-    frame->size = SAMPLES_PER_FRAME*2;
-    frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    if (param.ext_fmt.id == PJMEDIA_FORMAT_PCM) {
+        pjmedia_delay_buf_get(delaybuf, (pj_int16_t*)frame->buf);
+        frame->size = SAMPLES_PER_FRAME*2;
+        frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    } else {
+        pjmedia_frame_ext *f_src = (pjmedia_frame_ext*)frame_buf;
+        pjmedia_frame_ext *f_dst = (pjmedia_frame_ext*)frame;
+
+        copy_frame_ext(f_dst, f_src);
+    }
 
     ++play_cnt;
@@ -166 +198 @@
 static pj_status_t snd_start(unsigned flag)
 {
-    pjmedia_aud_param param;
     pj_status_t status;
 
@@ -179 +210 @@
     param.samples_per_frame = SAMPLES_PER_FRAME;
     param.dir = (pjmedia_dir) flag;
+    param.ext_fmt.id = PJMEDIA_FORMAT_AMR;
+    param.ext_fmt.bitrate = 12200;
+    param.output_route = PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER;
 
     status = pjmedia_aud_stream_create(&param, &rec_cb, &play_cb, NULL, &strm);