| Index: talk/session/media/channel.cc
|
| diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
|
| index 818a659c46664c2334c6a36fc232d55c83b30c05..7a397e434c8bb35babf920d88e76dafe9db715aa 100644
|
| --- a/talk/session/media/channel.cc
|
| +++ b/talk/session/media/channel.cc
|
| @@ -114,15 +114,6 @@ struct DataChannelErrorMessageData : public rtc::MessageData {
|
| DataMediaChannel::Error error;
|
| };
|
|
|
| -
|
| -struct VideoChannel::ScreencastDetailsData {
|
| - explicit ScreencastDetailsData(uint32_t s)
|
| - : ssrc(s), fps(0), screencast_max_pixels(0) {}
|
| - uint32_t ssrc;
|
| - int fps;
|
| - int screencast_max_pixels;
|
| -};
|
| -
|
| static const char* PacketType(bool rtcp) {
|
| return (!rtcp) ? "RTP" : "RTCP";
|
| }
|
| @@ -1698,20 +1689,6 @@ bool VideoChannel::IsScreencasting() {
|
| return InvokeOnWorker(Bind(&VideoChannel::IsScreencasting_w, this));
|
| }
|
|
|
| -int VideoChannel::GetScreencastFps(uint32_t ssrc) {
|
| - ScreencastDetailsData data(ssrc);
|
| - worker_thread()->Invoke<void>(Bind(
|
| - &VideoChannel::GetScreencastDetails_w, this, &data));
|
| - return data.fps;
|
| -}
|
| -
|
| -int VideoChannel::GetScreencastMaxPixels(uint32_t ssrc) {
|
| - ScreencastDetailsData data(ssrc);
|
| - worker_thread()->Invoke<void>(Bind(
|
| - &VideoChannel::GetScreencastDetails_w, this, &data));
|
| - return data.screencast_max_pixels;
|
| -}
|
| -
|
| bool VideoChannel::SendIntraFrame() {
|
| worker_thread()->Invoke<void>(Bind(
|
| &VideoMediaChannel::SendIntraFrame, media_channel()));
|
| @@ -1924,18 +1901,6 @@ bool VideoChannel::IsScreencasting_w() const {
|
| return !screencast_capturers_.empty();
|
| }
|
|
|
| -void VideoChannel::GetScreencastDetails_w(
|
| - ScreencastDetailsData* data) const {
|
| - ScreencastMap::const_iterator iter = screencast_capturers_.find(data->ssrc);
|
| - if (iter == screencast_capturers_.end()) {
|
| - return;
|
| - }
|
| - VideoCapturer* capturer = iter->second;
|
| - const VideoFormat* video_format = capturer->GetCaptureFormat();
|
| - data->fps = VideoFormat::IntervalToFps(video_format->interval);
|
| - data->screencast_max_pixels = capturer->screencast_max_pixels();
|
| -}
|
| -
|
| void VideoChannel::OnScreencastWindowEvent_s(uint32_t ssrc,
|
| rtc::WindowEvent we) {
|
| ASSERT(signaling_thread() == rtc::Thread::Current());
|
|
|