generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move frame input (ViECapturer) to webrtc/video/.

Browse Source 
Renames ViECapturer to VideoCaptureInput and initializes several
parameters on construction instead of setters.

Also removes an old deadlock suppression.

BUG=1695, 2999
R=asapersson@webrtc.org, mflodman@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#9508}
This commit is contained in:
Peter Boström
2015-06-26 06:58:16 +02:00
parent ebe7422372
commit 4b91bd0897
27 changed files with 221 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talk/media/webrtc/fakewebrtccall.cc
View File

@@ -145,7 +145,7 @@ bool FakeVideoSendStream::ReconfigureVideoEncoder(
return true;
}
webrtc::VideoSendStreamInput* FakeVideoSendStream::Input() {
webrtc::VideoCaptureInput* FakeVideoSendStream::Input() {
return this;
}

4
talk/media/webrtc/fakewebrtccall.h
View File

@@ -55,7 +55,7 @@ class FakeAudioReceiveStream : public webrtc::AudioReceiveStream {
};
class FakeVideoSendStream : public webrtc::VideoSendStream,
public webrtc::VideoSendStreamInput {
public webrtc::VideoCaptureInput {
public:
FakeVideoSendStream(const webrtc::VideoSendStream::Config& config,
const webrtc::VideoEncoderConfig& encoder_config);
@@ -79,7 +79,7 @@ class FakeVideoSendStream : public webrtc::VideoSendStream,
bool ReconfigureVideoEncoder(
const webrtc::VideoEncoderConfig& config) override;
webrtc::VideoSendStreamInput* Input() override;
webrtc::VideoCaptureInput* Input() override;
void Start() override;
void Stop() override;

2
talk/media/webrtc/fakewebrtcvideoengine.h
View File

@@ -56,8 +56,6 @@ static const int kMaxVideoBitrate = 1000;
// renderer for a channel or it is adding a renderer for a capturer.
static const int kViEChannelIdBase = 0;
static const int kViEChannelIdMax = 1000;
static const int kViECaptureIdBase = 10000; // Make sure there is a gap.
static const int kViECaptureIdMax = 11000;
// Fake class for mocking out webrtc::VideoDecoder
class FakeWebRtcVideoDecoder : public webrtc::VideoDecoder {