Remove SendStreamFormat and ViewRequests.

talk/media/webrtc/webrtcvideoengine2.cc

 /*
  * libjingle
  * Copyright 2014 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 952 matching lines @@
 
 bool WebRtcVideoChannel2::GetSendCodec(VideoCodec* codec) {
   if (!send_codec_) {
     LOG(LS_VERBOSE) << "GetSendCodec: No send codec set.";
     return false;
   }
   *codec = send_codec_->codec;
   return true;
 }
 
-bool WebRtcVideoChannel2::SetSendStreamFormat(uint32_t ssrc,
-                                              const VideoFormat& format) {
-  LOG(LS_VERBOSE) << "SetSendStreamFormat:" << ssrc << " -> "
-                  << format.ToString();
-  rtc::CritScope stream_lock(&stream_crit_);
-  if (send_streams_.find(ssrc) == send_streams_.end()) {
-    return false;
-  }
-  return send_streams_[ssrc]->SetVideoFormat(format);
-}
-
 bool WebRtcVideoChannel2::SetSend(bool send) {
   LOG(LS_VERBOSE) << "SetSend: " << (send ? "true" : "false");
   if (send && !send_codec_) {
     LOG(LS_ERROR) << "SetSend(true) called before setting codec.";
     return false;
   }
   if (send) {
     StartAllSendStreams();
   } else {
     StopAllSendStreams();
@@ skipping 691 matching lines @@
     }
 
     capturer_ = capturer;
   }
   // Lock cannot be held while connecting the capturer to prevent lock-order
   // violations.
   capturer->SignalVideoFrame.connect(this, &WebRtcVideoSendStream::InputFrame);
   return true;
 }
 
-// TODO(pbos): Apply this on the VideoAdapter instead!
-bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoFormat(
-    const VideoFormat& format) {
-  if ((format.width == 0 || format.height == 0) &&
-      format.width != format.height) {
-    LOG(LS_ERROR) << "Can't set VideoFormat, width or height is zero (but not "
-                     "both, 0x0 drops frames).";
-    return false;
-  }
-
-  rtc::CritScope cs(&lock_);
-  if (format.width == 0 && format.height == 0) {
-    LOG(LS_INFO)
-        << "0x0 resolution selected. Captured frames will be dropped for ssrc: "
-        << parameters_.config.rtp.ssrcs[0] << ".";
-  } else {
-    // TODO(pbos): Fix me, this only affects the last stream!
-    parameters_.encoder_config.streams.back().max_framerate =
-        VideoFormat::IntervalToFps(format.interval);
-    SetDimensions(format.width, format.height, false);
-  }
-
-  format_ = format;
-  return true;
-}
-
 void WebRtcVideoChannel2::WebRtcVideoSendStream::MuteStream(bool mute) {
   rtc::CritScope cs(&lock_);
   muted_ = mute;
 }
 
 bool WebRtcVideoChannel2::WebRtcVideoSendStream::DisconnectCapturer() {
   cricket::VideoCapturer* capturer;
   {
     rtc::CritScope cs(&lock_);
     if (capturer_ == NULL)
@@ skipping 854 matching lines @@
       video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
     }
   }
 
   return video_codecs;
 }
 
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VIDEO