Changeset 785 for pjproject/trunk

Timestamp:

Oct 20, 2006 11:08:49 AM (18 years ago)

Author:

bennylp

Message:

Changed the processing of mp3 _options in mp3 writer with regard to bit_rate and quality to comply with LAME, also changed the pjsua_recorder_create() parameter to allow specifying mp3 options in one of the parameter

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/mp3_port.h (modified) (1 diff)
• pjmedia/src/pjmedia/mp3_writer.c (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

pjproject/trunk/pjmedia/include/pjmedia/mp3_port.h

@@ -60 +60 @@
 typedef struct pjmedia_mp3_encoder_option
 {
-    /** Specify whether variable bit rate should be used (say Yes!).        */
+    /** Specify whether variable bit rate should be used. Variable bitrate
+     *  would normally produce better quality at the expense of probably
+     *  larger file.
+     */
     pj_bool_t   vbr;
 
-    /** Target bitrate, in bps. If zero, bitrate will be  calculated.       */
+    /** Target bitrate, in bps. For VBR, if the bitrate is specified, then 
+     *  the encoder will ignore the quality settings and instead will try to 
+     *  limit the bitrate to the desired value in this setting.
+     */
     unsigned    bit_rate;
 
-    /** Encoding quality, 0-9, with 0 is the highest.                       */
+    /** Encoding quality, 0-9, with 0 is the highest quality. For VBR, the 
+     *  quality setting will only take effect when bit_rate setting is zero.
+     */
     unsigned    quality;
 

pjproject/trunk/pjmedia/src/pjmedia/mp3_writer.c

@@ -200 +200 @@
         LConfig.format.LHV1.nVbrMethod = VBR_METHOD_DEFAULT;
         LConfig.format.LHV1.bWriteVBRHeader = 1;
-        //LConfig.format.LHV1.dwVbrAbr_bps = fport->mp3_option.bit_rate;
+        LConfig.format.LHV1.dwVbrAbr_bps = fport->mp3_option.bit_rate;
         LConfig.format.LHV1.bEnableVBR = 1;
     }
@@ -295 +295 @@
     }
 
-    /* Calculate bitrate if it's not specified */
-    if (fport->mp3_option.bit_rate == 0) 
+    /* Calculate bitrate if it's not specified, only if it's not VBR. */
+    if (fport->mp3_option.bit_rate == 0 && !fport->mp3_option.vbr) 
         fport->mp3_option.bit_rate = sampling_rate * channel_count;
 

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2530 +2530 @@
 /**
  * Create a file recorder, and automatically connect this recorder to
- * the conference bridge.
+ * the conference bridge. The recorder currently supports recording WAV file,
+ * and on Windows, MP3 file. The type of the recorder to use is determined
+ * by the extension of the file (e.g. ".wav" or ".mp3").
  *
  * @param filename      Output file name. The function will determine the
@@ -2536 +2538 @@
  *                      Currently ".wav" is supported on all platforms, and
  *                      also ".mp3" is support on Windows.
- * @param file_format   This option is obsolete.
- * @param encoding      Optionally specify the encoding to be applied to the
- *                      file. By default (if NULL is specified), the encoding
- *                      is determined from the file extension (i.e. 16bit PCM
- *                      is used for the WAV files).
- * @param max_size      Maximum file size. Specify -1 to remove size
- *                      limitation.
+ * @param enc_type      Optionally specify the type of encoder to be used to
+ *                      compress the media, if the file can support different
+ *                      encodings. This value must be zero for now.
+ * @param enc_param     Optionally specify codec specific parameter to be 
+ *                      passed to the file writer. For .MP3 recorder, this
+ *                      can point to pjmedia_mp3_encoder_option structure to
+ *                      specify additional settings for the .mp3 recorder.
+ *                      For .WAV recorder, this value must be NULL.
+ * @param max_size      Maximum file size. Specify zero or -1 to remove size
+ *                      limitation. This value must be zero or -1 for now.
  * @param options       Optional options.
  * @param p_id          Pointer to receive the recorder instance.
@@ -2549 +2554 @@
  */
 PJ_DECL(pj_status_t) pjsua_recorder_create(const pj_str_t *filename,
-                                           unsigned file_format,
-                                           const pj_str_t *encoding,
+                                           unsigned enc_type,
+                                           void *enc_param,
                                            pj_ssize_t max_size,
                                            unsigned options,

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -797 +797 @@
  */
 PJ_DEF(pj_status_t) pjsua_recorder_create( const pj_str_t *filename,
-                                           unsigned file_format,
-                                           const pj_str_t *encoding,
+                                           unsigned enc_type,
+                                           void *enc_param,
                                            pj_ssize_t max_size,
                                            unsigned options,
@@ -812 +812 @@
     char path[128];
     pj_str_t ext;
+    int file_format;
     pjmedia_port *port;
     pj_status_t status;
@@ -821 +822 @@
     PJ_ASSERT_RETURN(max_size == 0 || max_size == -1, PJ_EINVAL);
 
-    /* Don't support file format at present */
-    PJ_ASSERT_RETURN(file_format == 0, PJ_EINVAL);
-
-    /* Don't support encoding at present */
-    PJ_ASSERT_RETURN(encoding == NULL, PJ_EINVAL);
+    /* Don't support encoding type at present */
+    PJ_ASSERT_RETURN(enc_type == 0, PJ_EINVAL);
 
     if (pjsua_var.rec_cnt >= PJ_ARRAY_SIZE(pjsua_var.recorder))
@@ -875 +873 @@
                                                 pjsua_var.mconf_cfg.samples_per_frame,
                                                 pjsua_var.mconf_cfg.bits_per_sample,
-                                                NULL, &port);
+                                                enc_param, &port);
     } else {
         port = NULL;