commit 63136921ece04448f1bc71ce6f3e43974f9d385a
author stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Mar 19 10:04:57 2013 +0000
committer stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Mar 19 10:04:57 2013 +0000
tree 3450898c4df0ff8658883929dfe480698edd0d43
parent 46618db32642a8c202fc656039ce6a7019007b0d

Follow-up fix for r3681.

TESTS=trybots and vie_auto_test
BUG=1514

Review URL: https://webrtc-codereview.appspot.com/1216006

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3689 4adac7df-926f-26a2-2b94-8c16560cd09d

video_engine/vie_encoder.cc

diff --git a/video_engine/vie_encoder.cc b/video_engine/vie_encoder.cc
index 386f262..01a7672 100644
--- a/video_engine/vie_encoder.cc
+++ b/video_engine/vie_encoder.cc
@@ -306,11 +306,13 @@
 
   webrtc::VideoCodec current_send_codec;
   if (vcm_.SendCodec(&current_send_codec) == VCM_OK) {
-    if (vcm_.Bitrate(&current_send_codec.startBitrate) != 0) {
+    uint32_t current_bitrate_bps = 0;
+    if (vcm_.Bitrate(&current_bitrate_bps) != 0) {
       WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideo,
                    ViEId(engine_id_, channel_id_),
                    "Failed to get the current encoder target bitrate.");
     }
+    current_send_codec.startBitrate = (current_bitrate_bps + 500) / 1000;
   }
 
   if (vcm_.RegisterExternalEncoder(NULL, pl_type) != VCM_OK) {
@@ -681,11 +683,14 @@
     webrtc::VideoCodec codec;
     if (vcm_.SendCodec(&codec) == 0) {
       WebRtc_UWord16 max_pay_load = default_rtp_rtcp_->MaxDataPayloadLength();
-      if (vcm_.Bitrate(&codec.startBitrate) != 0) {
+      uint32_t current_bitrate_bps = 0;
+      if (vcm_.Bitrate(&current_bitrate_bps) != 0) {
         WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideo,
                      ViEId(engine_id_, channel_id_),
                      "Failed to get the current encoder target bitrate.");
       }
+      // Convert to start bitrate in kbps.
+      codec.startBitrate = (current_bitrate_bps + 500) / 1000;
       if (vcm_.RegisterSendCodec(&codec, number_of_cores_, max_pay_load) != 0) {
         WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideo,
                      ViEId(engine_id_, channel_id_),