Changeset 3116 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp

Timestamp:

Mar 4, 2010 3:47:25 PM (14 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).

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp (modified) (11 diffs)

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;