Remove SendStreamFormat and ViewRequests.

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 1667 matching lines @@
 
   Deinit();
 }
 
 bool VideoChannel::SetRenderer(uint32_t ssrc, VideoRenderer* renderer) {
   worker_thread()->Invoke<void>(Bind(
       &VideoMediaChannel::SetRenderer, media_channel(), ssrc, renderer));
   return true;
 }
 
-bool VideoChannel::ApplyViewRequest(const ViewRequest& request) {
-  return InvokeOnWorker(Bind(&VideoChannel::ApplyViewRequest_w, this, request));
-}
-
 bool VideoChannel::AddScreencast(uint32_t ssrc, VideoCapturer* capturer) {
   return worker_thread()->Invoke<bool>(Bind(
       &VideoChannel::AddScreencast_w, this, ssrc, capturer));
 }
 
 bool VideoChannel::SetCapturer(uint32_t ssrc, VideoCapturer* capturer) {
   return InvokeOnWorker(Bind(&VideoMediaChannel::SetCapturer,
                              media_channel(), ssrc, capturer));
 }
 
@@ skipping 137 matching lines @@
 
   if (video->rtp_header_extensions_set()) {
     MaybeCacheRtpAbsSendTimeHeaderExtension(video->rtp_header_extensions());
   }
 
   set_remote_content_direction(content->direction());
   ChangeState();
   return true;
 }
 
-bool VideoChannel::ApplyViewRequest_w(const ViewRequest& request) {
-  bool ret = true;
-  // Set the send format for each of the local streams. If the view request
-  // does not contain a local stream, set its send format to 0x0, which will
-  // drop all frames.
-  for (std::vector<StreamParams>::const_iterator it = local_streams().begin();
-      it != local_streams().end(); ++it) {
-    VideoFormat format(0, 0, 0, cricket::FOURCC_I420);
-    StaticVideoViews::const_iterator view;
-    for (view = request.static_video_views.begin();
-         view != request.static_video_views.end(); ++view) {
-      if (view->selector.Matches(*it)) {
-        format.width = view->width;
-        format.height = view->height;
-        format.interval = cricket::VideoFormat::FpsToInterval(view->framerate);
-        break;
-      }
-    }
-
-    ret &= media_channel()->SetSendStreamFormat(it->first_ssrc(), format);
-  }
-
-  // Check if the view request has invalid streams.
-  for (StaticVideoViews::const_iterator it = request.static_video_views.begin();
-      it != request.static_video_views.end(); ++it) {
-    if (!GetStream(local_streams(), it->selector)) {
-      LOG(LS_WARNING) << "View request for ("
-                      << it->selector.ssrc << ", '"
-                      << it->selector.groupid << "', '"
-                      << it->selector.streamid << "'"
-                      << ") is not in the local streams.";
-    }
-  }
-
-  return ret;
-}
-
 bool VideoChannel::AddScreencast_w(uint32_t ssrc, VideoCapturer* capturer) {
   if (screencast_capturers_.find(ssrc) != screencast_capturers_.end()) {
     return false;
   }
   capturer->SignalStateChange.connect(this, &VideoChannel::OnStateChange);
   screencast_capturers_[ssrc] = capturer;
   return true;
 }
 
 bool VideoChannel::RemoveScreencast_w(uint32_t ssrc) {
@@ skipping 410 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