| Index: webrtc/media/engine/webrtcvideoengine2.h
|
| diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
|
| index 91a92bff5fc5a16ecbd8e92aa6d5addbeddb6bed..da4073a919b7d93a50d04fee109c83335eb9303c 100644
|
| --- a/webrtc/media/engine/webrtcvideoengine2.h
|
| +++ b/webrtc/media/engine/webrtcvideoengine2.h
|
| @@ -299,10 +299,9 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
|
| // the first frame to know that you gave a bad codec parameter could make
|
| // debugging hard).
|
| // TODO(pbos): Consider setting up encoders lazily.
|
| - Dimensions() : width(176), height(144), is_screencast(false) {}
|
| + Dimensions() : width(176), height(144) {}
|
| int width;
|
| int height;
|
| - bool is_screencast;
|
| };
|
|
|
| union VideoEncoderSettings {
|
| @@ -322,23 +321,20 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
|
| int max_bitrate_bps,
|
| size_t num_streams);
|
|
|
| - void* ConfigureVideoEncoderSettings(const VideoCodec& codec,
|
| - const VideoOptions& options,
|
| - bool is_screencast)
|
| + void* ConfigureVideoEncoderSettings(const VideoCodec& codec)
|
| EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
|
|
| AllocatedEncoder CreateVideoEncoder(const VideoCodec& codec)
|
| EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
| void DestroyVideoEncoder(AllocatedEncoder* encoder)
|
| EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
| - void SetCodecAndOptions(const VideoCodecSettings& codec,
|
| - const VideoOptions& options)
|
| + void SetCodecAndOptions(const VideoCodecSettings& codec)
|
| EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
| void RecreateWebRtcStream() EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
| webrtc::VideoEncoderConfig CreateVideoEncoderConfig(
|
| const Dimensions& dimensions,
|
| const VideoCodec& codec) const EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
| - void SetDimensions(int width, int height, bool is_screencast)
|
| + void SetDimensions(int width, int height)
|
| EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
|
|
| const std::vector<uint32_t> ssrcs_;
|
|
|