From b4bc65b4e9bafde140ce7df168a13b7490b677c9 Mon Sep 17 00:00:00 2001
From: stefan <stefan@webrtc.org>
Date: Wed, 2 Nov 2016 10:10:20 -0700
Subject: [PATCH] Fix circular dependency between call and video receive
 stream.

BUG=webrtc:4243

Review-Url: https://codereview.webrtc.org/2469293003
Cr-Commit-Position: refs/heads/master@{#14899}
---
 webrtc/video/video_receive_stream.cc | 3 ++-
 webrtc/video/video_receive_stream.h  | 1 -
 webrtc/video/video_send_stream.h     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc
index 27d1fe4614..5173b2d479 100644
--- a/webrtc/video/video_receive_stream.cc
+++ b/webrtc/video/video_receive_stream.cc
@@ -169,8 +169,9 @@ VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) {
 
   codec.width = 320;
   codec.height = 180;
+  const int kDefaultStartBitrate = 300;
   codec.startBitrate = codec.minBitrate = codec.maxBitrate =
-      Call::Config::kDefaultStartBitrateBps / 1000;
+      kDefaultStartBitrate;
 
   return codec;
 }
diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
index c6d21d29c5..f2a7c81f65 100644
--- a/webrtc/video/video_receive_stream.h
+++ b/webrtc/video/video_receive_stream.h
@@ -14,7 +14,6 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/call.h"
 #include "webrtc/call/transport_adapter.h"
 #include "webrtc/common_video/include/incoming_video_stream.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
index ff52c031af..e2c3616d7d 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -19,7 +19,6 @@
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/task_queue.h"
-#include "webrtc/call.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_coding/protection_bitrate_calculator.h"
 #include "webrtc/video/encoder_rtcp_feedback.h"