From 94bc4cf905e1b05c3beae2347f4e94ebc6cc5230 Mon Sep 17 00:00:00 2001
From: "marpan@webrtc.org"
 <marpan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 22 Mar 2013 17:13:08 +0000
Subject: [PATCH] Add min and target bitrate to VideoCodec. Review URL:
 https://webrtc-codereview.appspot.com/1214004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3710 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/common_types.h                                |  2 ++
 .../test/auto_test/source/vie_autotest_simulcast.cc  | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index 4ea58c7e1f..e0b8c1930d 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -545,6 +545,8 @@ struct SimulcastStream
     unsigned short      height;
     unsigned char       numberOfTemporalLayers;
     unsigned int        maxBitrate;
+    unsigned int        targetBitrate;
+    unsigned int        minBitrate;
     unsigned int        qpMax; // minimum quality
 };
 
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
index 1af7a6dec3..5c01cbf98d 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
@@ -48,18 +48,24 @@ void SetSimulcastSettings(webrtc::VideoCodec* video_codec) {
   video_codec->simulcastStream[0].height = 180;
   video_codec->simulcastStream[0].numberOfTemporalLayers = 0;
   video_codec->simulcastStream[0].maxBitrate = 100;
+  video_codec->simulcastStream[0].targetBitrate = 100;
+  video_codec->simulcastStream[0].minBitrate = 0;
   video_codec->simulcastStream[0].qpMax = video_codec->qpMax;
 
   video_codec->simulcastStream[1].width = 640;
   video_codec->simulcastStream[1].height = 360;
   video_codec->simulcastStream[1].numberOfTemporalLayers = 0;
   video_codec->simulcastStream[1].maxBitrate = 500;
+  video_codec->simulcastStream[1].targetBitrate = 500;
+  video_codec->simulcastStream[1].minBitrate = 200;
   video_codec->simulcastStream[1].qpMax = video_codec->qpMax;
 
   video_codec->simulcastStream[2].width = 1280;
   video_codec->simulcastStream[2].height = 720;
   video_codec->simulcastStream[2].numberOfTemporalLayers = 0;
   video_codec->simulcastStream[2].maxBitrate = 1200;
+  video_codec->simulcastStream[2].targetBitrate = 1200;
+  video_codec->simulcastStream[2].minBitrate = 900;
   video_codec->simulcastStream[2].qpMax = video_codec->qpMax;
 }
 
@@ -69,8 +75,14 @@ void RuntimeSingleStreamSettings(webrtc::VideoCodec* video_codec) {
   video_codec->height = 800;
   video_codec->numberOfSimulcastStreams = kNumStreams;
   video_codec->simulcastStream[0].maxBitrate = 0;
+  video_codec->simulcastStream[0].targetBitrate = 0;
+  video_codec->simulcastStream[0].minBitrate = 0;
   video_codec->simulcastStream[1].maxBitrate = 0;
+  video_codec->simulcastStream[1].targetBitrate = 0;
+  video_codec->simulcastStream[1].minBitrate = 0;
   video_codec->simulcastStream[2].maxBitrate = 0;
+  video_codec->simulcastStream[2].targetBitrate = 0;
+  video_codec->simulcastStream[2].minBitrate = 0;
 }
 
 int VideoEngineSimulcastTest(void* window1, void* window2) {