Deleted VideoCapturer::screencast_max_pixels and related unused code.

talk/session/media/channel.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 96 matching lines @@
 };
 
 struct DataChannelErrorMessageData : public rtc::MessageData {
   DataChannelErrorMessageData(uint32_t in_ssrc,
                               DataMediaChannel::Error in_error)
       : ssrc(in_ssrc), error(in_error) {}
   uint32_t ssrc;
   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";
 }
 
 static bool ValidPacket(bool rtcp, const rtc::Buffer* packet) {
   // Check the packet size. We could check the header too if needed.
   return (packet &&
           packet->size() >= (!rtcp ? kMinRtpPacketLen : kMinRtcpPacketLen) &&
           packet->size() <= kMaxRtpPacketLen);
 }
@@ skipping 1555 matching lines @@
 }
 
 bool VideoChannel::RemoveScreencast(uint32_t ssrc) {
   return InvokeOnWorker(Bind(&VideoChannel::RemoveScreencast_w, this, ssrc));
 }
 
 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()));
   return true;
 }
 
 bool VideoChannel::RequestIntraFrame() {
   worker_thread()->Invoke<void>(Bind(
       &VideoMediaChannel::RequestIntraFrame, media_channel()));
   return true;
@@ skipping 192 matching lines @@
   // Clean up VideoCapturer.
   delete iter->second;
   screencast_capturers_.erase(iter);
   return true;
 }
 
 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());
   SignalScreencastWindowEvent(ssrc, we);
 }
 
 void VideoChannel::OnMessage(rtc::Message *pmsg) {
   switch (pmsg->message_id) {
     case MSG_SCREENCASTWINDOWEVENT: {
       const ScreencastEventMessageData* data =
@@ skipping 386 matching lines @@
   return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
 }
 
 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
   rtc::TypedMessageData<uint32_t>* message =
       new rtc::TypedMessageData<uint32_t>(sid);
   signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
 }
 
 }  // namespace cricket