Changeset 2456 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/symbian_sound_aps.cpp

Timestamp:

Feb 16, 2009 4:29:05 PM (16 years ago)

Author:

nanang

Message:

Changed term 'fourcc' to 'format' and few minor fixes/updates.

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/symbian_sound_aps.cpp (modified) (25 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/symbian_sound_aps.cpp

@@ -509 +509 @@
         iSession.Stop();
         state_ = STATE_READY;
-        TRACE_((THIS_FILE, "Streaming stopped"));
+        TRACE_((THIS_FILE, "Sound device stopped"));
     }
 }
@@ -550 +550 @@
     if (parentStrm_->dir != PJMEDIA_DIR_CAPTURE) {
         iSession.Write();
-        TRACE_((THIS_FILE, "Player streaming started"));
+        TRACE_((THIS_FILE, "Player started"));
     }
 
@@ -556 +556 @@
     if (parentStrm_->dir != PJMEDIA_DIR_PLAYBACK) {
         iSession.Read();
-        TRACE_((THIS_FILE, "Recorder streaming started"));
+        TRACE_((THIS_FILE, "Recorder started"));
     }
 
@@ -569 +569 @@
 void CPjAudioEngine::InputStreamInitialized(const TInt aStatus)
 {
-    TRACE_((THIS_FILE, "InputStreamInitialized %d", aStatus));
+    TRACE_((THIS_FILE, "Recorder initialized, err=%d", aStatus));
 
     state_ = STATE_READY;
@@ -579 +579 @@
 void CPjAudioEngine::OutputStreamInitialized(const TInt aStatus)
 {
-    TRACE_((THIS_FILE, "OutputStreamInitialized %d", aStatus));
+    TRACE_((THIS_FILE, "Player initialized, err=%d", aStatus));
 
     if (aStatus == KErrNone) {
@@ -605 +605 @@
     if (state_ == STATE_READY || state_ == STATE_STREAMING) {
         iSession.ActivateLoudspeaker(active);
-        TRACE_((THIS_FILE, "Loudspeaker on/off: %d", active));
+        TRACE_((THIS_FILE, "Loudspeaker turned %s", (active? "on":"off")));
         return KErrNone;
     }
@@ -709 +709 @@
     
     switch(strm->setting.format.u32) {
-    case PJMEDIA_FOURCC_AMR:
+    case PJMEDIA_FORMAT_AMR:
         {
             const pj_uint8_t *p = (const pj_uint8_t*)buf.iBuffer.Ptr() + 1;
@@ -724 +724 @@
         break;
         
-    case PJMEDIA_FOURCC_G729:
+    case PJMEDIA_FORMAT_G729:
         {
             /* Check if we got a normal or SID frame. */
@@ -753 +753 @@
         break;
 
-    case PJMEDIA_FOURCC_ILBC:
+    case PJMEDIA_FORMAT_ILBC:
         {
             unsigned samples_got;
@@ -779 +779 @@
         break;
         
-    case PJMEDIA_FOURCC_PCMU:
-    case PJMEDIA_FOURCC_PCMA:
+    case PJMEDIA_FORMAT_PCMU:
+    case PJMEDIA_FORMAT_PCMA:
         {
             unsigned samples_processed = 0;
@@ -837 +837 @@
 
     switch(strm->setting.format.u32) {
-    case PJMEDIA_FOURCC_AMR:
+    case PJMEDIA_FORMAT_AMR:
         {
             if (frame->samples_cnt == 0) {
@@ -884 +884 @@
         break;
         
-    case PJMEDIA_FOURCC_G729:
+    case PJMEDIA_FORMAT_G729:
         {
             if (frame->samples_cnt == 0) {
@@ -933 +933 @@
         break;
         
-    case PJMEDIA_FOURCC_ILBC:
+    case PJMEDIA_FORMAT_ILBC:
         {
             if (frame->samples_cnt == 0) {
@@ -973 +973 @@
         break;
         
-    case PJMEDIA_FOURCC_PCMU:
-    case PJMEDIA_FOURCC_PCMA:
+    case PJMEDIA_FORMAT_PCMU:
+    case PJMEDIA_FORMAT_PCMA:
         {
             unsigned samples_ready = 0;
@@ -1006 +1006 @@
                     } else {
                         pj_uint8_t silc;
-                        silc = (strm->setting.format.u32==PJMEDIA_FOURCC_PCMU)?
+                        silc = (strm->setting.format.u32==PJMEDIA_FORMAT_PCMU)?
                                 pjmedia_linear2ulaw(0) : pjmedia_linear2alaw(0);
                         buf.iBuffer.AppendFill(silc, samples_cnt);
@@ -1017 +1017 @@
                     pj_uint8_t silc;
                     
-                    silc = (strm->setting.format.u32==PJMEDIA_FOURCC_PCMU)?
+                    silc = (strm->setting.format.u32==PJMEDIA_FORMAT_PCMU)?
                             pjmedia_linear2ulaw(0) : pjmedia_linear2alaw(0);
                     buf.iBuffer.AppendFill(silc, samples_req - samples_ready);
@@ -1105 +1105 @@
     strm->setting = *setting;
 
-    if (strm->setting.format.u32 == 0)
-        strm->setting.format.u32 = PJMEDIA_FOURCC_L16;
-
     /* Set audio engine fourcc. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_L16)
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_PCMU ||
+        strm->setting.format.u32 == PJMEDIA_FORMAT_PCMA ||
+        strm->setting.format.u32 == PJMEDIA_FORMAT_L16)
     {
         aps_setting.fourcc = TFourCC(KMCPFourCCIdG711);
@@ -1119 +1116 @@
 
     /* Set audio engine mode. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_AMR)
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_AMR)
     {
         aps_setting.mode = (TAPSCodecMode)strm->setting.bitrate;
     } 
-    else if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
-             strm->setting.format.u32 == PJMEDIA_FOURCC_L16   ||
-            (strm->setting.format.u32 == PJMEDIA_FOURCC_ILBC  &&
+    else if (strm->setting.format.u32 == PJMEDIA_FORMAT_PCMU ||
+             strm->setting.format.u32 == PJMEDIA_FORMAT_L16 ||
+            (strm->setting.format.u32 == PJMEDIA_FORMAT_ILBC  &&
              strm->setting.mode == 30))
     {
         aps_setting.mode = EULawOr30ms;
     } 
-    else if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
-            (strm->setting.format.u32 == PJMEDIA_FOURCC_ILBC &&
+    else if (strm->setting.format.u32 == PJMEDIA_FORMAT_PCMA ||
+            (strm->setting.format.u32 == PJMEDIA_FORMAT_ILBC &&
              strm->setting.mode == 20))
     {
@@ -1138 +1135 @@
 
     /* Disable VAD on L16 and G711. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_L16)
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_PCMU ||
+        strm->setting.format.u32 == PJMEDIA_FORMAT_PCMA ||
+        strm->setting.format.u32 == PJMEDIA_FORMAT_L16)
     {
         aps_setting.vad = EFalse;
@@ -1153 +1150 @@
 
     /* Set audio engine callbacks. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_L16) {
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_L16) {
         aps_play_cb = &PlayCbPcm;
         aps_rec_cb  = &RecCbPcm;
@@ -1183 +1180 @@
     strm->rec_buf_len = 0;
 
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_G729) {
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_G729) {
         TBitStream *g729_bitstream = new TBitStream;
         
@@ -1215 +1212 @@
 
     pj_bzero(&setting, sizeof(setting));
-    setting.format.u32 = PJMEDIA_FOURCC_L16;
+    setting.format.u32 = PJMEDIA_FORMAT_L16;
     
     return sound_open(PJMEDIA_DIR_CAPTURE, clock_rate, channel_count,
@@ -1237 +1234 @@
 
     pj_bzero(&setting, sizeof(setting));
-    setting.format.u32 = PJMEDIA_FOURCC_L16;
+    setting.format.u32 = PJMEDIA_FORMAT_L16;
 
     return sound_open(PJMEDIA_DIR_PLAYBACK, clock_rate, channel_count,
@@ -1262 +1259 @@
 
     pj_bzero(&setting, sizeof(setting));
-    setting.format.u32 = PJMEDIA_FOURCC_L16;
+    setting.format.u32 = PJMEDIA_FORMAT_L16;
 
     return sound_open(PJMEDIA_DIR_CAPTURE_PLAYBACK, clock_rate, channel_count,
@@ -1350 +1347 @@
     stream->engine = NULL;
 
-    if (stream->setting.format.u32 == PJMEDIA_FOURCC_G729) {
+    if (stream->setting.format.u32 == PJMEDIA_FORMAT_G729) {
         TBitStream *g729_bitstream = (TBitStream*)stream->strm_data;
         stream->strm_data = NULL;