admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix circular dependency between call and video receive stream.

Browse Source 
BUG=webrtc:4243

Review-Url: https://codereview.webrtc.org/2469293003
Cr-Commit-Position: refs/heads/master@{#14899}
This commit is contained in:
stefan 2016-11-02 10:10:20 -07:00 committed by Commit bot
parent 3e79dbdc37
commit b4bc65b4e9
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/video/video_receive_stream.cc
View File

@ -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;
}

1
webrtc/video/video_receive_stream.h
View File

@ -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"

1
webrtc/video/video_send_stream.h
View File

@ -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"