Changeset 4483

Timestamp:

Apr 19, 2013 9:52:02 AM (11 years ago)

Author:

ming

Message:

Re #1630: Fixed mp3 writer to work with PJSIP 2.x (thanks to Toni Rutar for the fix)

File:

• pjproject/trunk/third_party/mp3/mp3_writer.c (modified) (6 diffs)

pjproject/trunk/third_party/mp3/mp3_writer.c

@@ -38 +38 @@
 
 #define THIS_FILE           "mp3_writer.c"
-#define SIGNATURE           PJMEDIA_PORT_SIGNATURE('F', 'W', 'M', '3')
+#define SIGNATURE           PJMEDIA_SIG_CLASS_PORT_AUD('M','W')
 #define BYTES_PER_SAMPLE    2
 
@@ -176 +176 @@
     LConfig.format.LHV1.dwStructVersion = 1;
     LConfig.format.LHV1.dwStructSize = sizeof(BE_CONFIG);
-    LConfig.format.LHV1.dwSampleRate = fport->base.info.clock_rate;
+    LConfig.format.LHV1.dwSampleRate = PJMEDIA_PIA_SRATE(&fport->base.info);
     LConfig.format.LHV1.dwReSampleRate = 0;
 
-    if (fport->base.info.channel_count==1)
+    if (PJMEDIA_PIA_CCNT(&fport->base.info)==1)
         LConfig.format.LHV1.nMode = BE_MP3_MODE_MONO;
-    else if (fport->base.info.channel_count==2)
+    else if (PJMEDIA_PIA_CCNT(&fport->base.info)==2)
         LConfig.format.LHV1.nMode = BE_MP3_MODE_STEREO;
     else
@@ -323 +323 @@
               (int)fport->base.info.name.slen,
               fport->base.info.name.ptr,
-              fport->base.info.clock_rate/1000,
+                  PJMEDIA_PIA_SRATE(&fport->base.info),
               fport->mp3_option.bit_rate/1000,
               (fport->mp3_option.vbr ? " (VBR)" : ""),
@@ -377 +377 @@
     /* Record silence if input is no-frame */
     if (frame->type == PJMEDIA_FRAME_TYPE_NONE || frame->size == 0) {
-        unsigned samples_left = fport->base.info.samples_per_frame;
+        unsigned samples_left = PJMEDIA_PIA_SPF(&fport->base.info);
         unsigned samples_copied = 0;
 
         /* Only want to record at most 1 second of silence */
-        if (fport->silence_duration >= fport->base.info.clock_rate)
+        if (fport->silence_duration >= PJMEDIA_PIA_SRATE(&fport->base.info))
             return PJ_SUCCESS;
 
@@ -422 +422 @@
         }
 
-        fport->silence_duration += fport->base.info.samples_per_frame;
+        fport->silence_duration += PJMEDIA_PIA_SPF(&fport->base.info);
 
     }
@@ -429 +429 @@
      */
     else if (fport->mp3_samples_per_frame != 
-             fport->base.info.samples_per_frame) 
+             PJMEDIA_PIA_SPF(&fport->base.info)) 
     {
         unsigned samples_left = frame->size / 2;