Check for fractional samples per frame (#4482)

Author: dhoesele

pjmedia/include/pjmedia/conference.h

@@ -348,6 +348,13 @@ PJ_DECL(pj_status_t) pjmedia_conf_set_port0_name(pjmedia_conf *conf,
  * 
  * This operation executes asynchronously, use the callback set from
  * #pjmedia_conf_set_op_cb() to receive notification upon completion.
+ * 
+ * Note: Sample rate and ptime (frame duration) settings must be compatible.
+ * Configurations resulting in a fractional number of samples per frame
+ * are not supported and will cause the function to fail.
+ * For example, a sample rate of 22050 Hz and a frame duration (ptime) of 10 ms
+ * will result in 220.5 samples per frame, which is not an integer, 
+ * so port creation will fail.
  *
  * @param conf          The conference bridge.
  * @param pool          Pool to allocate buffers for this port.

pjmedia/include/pjmedia/wav_port.h

@@ -83,6 +83,13 @@ typedef struct pjmedia_wav_player_info
  * Create a media port to play streams from a WAV file. WAV player port
  * supports for reading WAV file with uncompressed 16 bit PCM format or 
  * compressed G.711 A-law/U-law format.
+ * 
+ * Note: The ptime value must be compatible with the WAV file's sample rate.
+ * If the combination results in a fractional number of samples per frame,
+ * port creation will fail.
+ * For example, a sample rate of 22050 Hz and a frame duration (ptime) of 10 ms
+ * will result in 220.5 samples per frame, which is not an integer, 
+ * so port creation will fail.
  *
  * @param pool          Pool to create memory buffers for this port.
  * @param filename      File name to open.

pjmedia/src/pjmedia/conference.c

@@ -531,6 +531,22 @@ static pj_status_t create_conf_port( pj_pool_t *parent_pool,
         conf_ptime = conf->samples_per_frame / conf->channel_count *
             1000 / conf->clock_rate;
 
+        /* Check compatibility of sample rate and ptime.
+         * Some combinations result in a fractional number of samples per frame
+         * which we do not support.
+         * One such case would be for example 10ms @ 22050Hz which would yield
+         * 220.5 samples per frame.
+         */
+        if (0 != (port_ptime * conf_port->clock_rate *
+                  conf_port->channel_count % 1000))
+        {
+            PJ_LOG(3,(THIS_FILE,
+                   "Cannot create conf port: incompatible sample rate/ptime"));
+            status = PJMEDIA_ENOTCOMPATIBLE;
+            goto on_return;
+        }
+
+
         /* Calculate the size (in ptime) for the port buffer according to
          * this formula:
          *   - if either ptime is an exact multiple of the other, then use
@@ -591,6 +607,13 @@ static pj_status_t create_conf_port( pj_pool_t *parent_pool,
 
 on_return:
     if (status != PJ_SUCCESS) {
+        /* Destroy resample if this conf port has it. */
+        if (conf_port->rx_resample)
+            pjmedia_resample_destroy(conf_port->rx_resample);
+
+        if (conf_port->tx_resample)
+            pjmedia_resample_destroy(conf_port->tx_resample);
+
         if (pool)
             pj_pool_release(pool);
     }

pjmedia/src/pjmedia/wav_player.c

@@ -416,6 +416,22 @@ PJ_DEF(pj_status_t) pjmedia_wav_player_port_create( pj_pool_t *pool_,
 
     /* It seems like we have a valid WAVE file. */
 
+    /* Check compatibility of sample rate and ptime.
+    * Some combinations result in a fractional number of samples per frame
+    * which we do not support.
+    * One such case would be for example 10ms @ 22050Hz which would yield
+    * 220.5 samples per frame.
+    */
+    if (0 != (ptime * wave_hdr.fmt_hdr.sample_rate *
+              wave_hdr.fmt_hdr.nchan % 1000)) 
+    {
+        pj_file_close(fport->fd);
+        PJ_LOG(3,(THIS_FILE,
+              "Cannot create wav player port: incompatible sample rate/ptime"));
+        status = PJMEDIA_ENOTCOMPATIBLE;
+        goto on_error;
+    }
+
     /* Initialize */
     fport->options = options;