highlevel_encode_setup.bitrate_av is in bps,

struct ovectl_ratemanage2_arg.bitrate_average_kbps is obviously in kbps.
So convert when reading/writing the latter (public) struct.

svn path=/trunk/vorbis/; revision=9032

diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
index 3c411ce..a9736d9 100644 (file)
--- a/lib/vorbisenc.c
+++ b/lib/vorbisenc.c
@@ -1093,7 +1093,7 @@ int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg){
        ai->management_active=hi->managed;
        ai->bitrate_limit_min_kbps=hi->bitrate_min;
        ai->bitrate_limit_max_kbps=hi->bitrate_max;
-       ai->bitrate_average_kbps=hi->bitrate_av;
+       ai->bitrate_average_kbps=hi->bitrate_av/1000;
        ai->bitrate_average_damping=hi->bitrate_av_damp;
        ai->bitrate_limit_reservoir_bits=hi->bitrate_reservoir;
        ai->bitrate_limit_reservoir_bias=hi->bitrate_reservoir_bias;
@@ -1137,7 +1137,7 @@ int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg){
          hi->managed=ai->management_active;
          hi->bitrate_min=ai->bitrate_limit_min_kbps;
          hi->bitrate_max=ai->bitrate_limit_max_kbps;
-         hi->bitrate_av=ai->bitrate_average_kbps;
+         hi->bitrate_av=ai->bitrate_average_kbps * 1000;
          hi->bitrate_av_damp=ai->bitrate_average_damping;
          hi->bitrate_reservoir=ai->bitrate_limit_reservoir_bits;
          hi->bitrate_reservoir_bias=ai->bitrate_limit_reservoir_bias;