Changeset 786 for pjproject

Timestamp:

Oct 21, 2006 9:23:37 AM (18 years ago)

Author:

bennylp

Message:

Fixed quality setting in MP3 writer (thanks Toni again)

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/mp3_port.h (modified) (1 diff)
• src/pjmedia/mp3_writer.c (modified) (1 diff)

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

@@ -66 +66 @@
     pj_bool_t   vbr;
 
-    /** 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.
+    /** Target bitrate, in bps. If VBR is enabled, this settings specifies 
+     *  the  average bit-rate requested, and will make the encoder ignore 
+     *  the quality setting. For CBR, this specifies the actual bitrate,
+     *  and if this option is zero, it will be set to the sampling rate
+     *  multiplied by number of channels.
      */
     unsigned    bit_rate;

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

@@ -201 +201 @@
         LConfig.format.LHV1.bWriteVBRHeader = 1;
         LConfig.format.LHV1.dwVbrAbr_bps = fport->mp3_option.bit_rate;
+        LConfig.format.LHV1.nVBRQuality =  (pj_uint16_t)
+                                           fport->mp3_option.quality;
         LConfig.format.LHV1.bEnableVBR = 1;
     }
 
-    LConfig.format.LHV1.nQuality =  (pj_uint16_t)fport->mp3_option.quality;
+    LConfig.format.LHV1.nQuality = (pj_uint16_t) 
+                                   (((0-fport->mp3_option.quality-1)<<8) | 
+                                    fport->mp3_option.quality);
 
     /*