commit 1b78cc3641a6d59feebcbb81144ff511bdb60b8c
author mflodman <mflodman@webrtc.org> Fri Nov 13 05:02:42 2015
committer Commit bot <commit-bot@chromium.org> Fri Nov 13 05:02:46 2015
tree 220c83f2c4496a2f0a207d3a6e5a74576d655df2
parent aeae9d6e1ce3022c034cbbcd206a297f9676999e

Move BitrateAllocator from BitrateController logic to Call.

This is a step on the way to have variable bitrate for audio and is
intended to be as much of a no-op as possible.

BUG=webrtc:5079

Review URL: https://codereview.webrtc.org/1441673002

Cr-Original-Commit-Position: refs/heads/master@{#10630}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 0e7e259ebd69993bb5670a991f43aa1b06c9bf9e

video_engine/vie_encoder.cc

diff --git a/video_engine/vie_encoder.cc b/video_engine/vie_encoder.cc
index e09b896..d9a45b0 100644
--- a/video_engine/vie_encoder.cc
+++ b/video_engine/vie_encoder.cc
@@ -17,6 +17,7 @@
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
+#include "webrtc/call/bitrate_allocator.h"
 #include "webrtc/common_video/interface/video_image.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/frame_callback.h"

video_engine/vie_encoder.h

diff --git a/video_engine/vie_encoder.h b/video_engine/vie_encoder.h
index 6421504..96889a2 100644
--- a/video_engine/vie_encoder.h
+++ b/video_engine/vie_encoder.h
@@ -19,7 +19,6 @@
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/frame_callback.h"
-#include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
 #include "webrtc/modules/video_processing/main/interface/video_processing.h"
@@ -28,6 +27,8 @@
 
 namespace webrtc {
 
+class BitrateAllocator;
+class BitrateObserver;
 class Config;
 class CriticalSectionWrapper;
 class EncodedImageCallback;