Add support for content hints to VideoTrack.

webrtc/api/rtpsender.cc

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 225 matching lines @@
   }
 }
 
 VideoRtpSender::VideoRtpSender(VideoTrackInterface* track,
                                const std::string& stream_id,
                                cricket::VideoChannel* channel)
     : id_(track->id()),
       stream_id_(stream_id),
       channel_(channel),
       track_(track),
-      cached_track_enabled_(track->enabled()) {
+      cached_track_enabled_(track->enabled()),
+      cached_track_content_hint_(track->content_hint()) {
   track_->RegisterObserver(this);
 }
 
 VideoRtpSender::VideoRtpSender(VideoTrackInterface* track,
                                cricket::VideoChannel* channel)
     : id_(track->id()),
       stream_id_(rtc::CreateRandomUuid()),
       channel_(channel),
       track_(track),
-      cached_track_enabled_(track->enabled()) {
+      cached_track_enabled_(track->enabled()),
+      cached_track_content_hint_(track->content_hint()) {
   track_->RegisterObserver(this);
 }
 
 VideoRtpSender::VideoRtpSender(cricket::VideoChannel* channel)
     : id_(rtc::CreateRandomUuid()),
       stream_id_(rtc::CreateRandomUuid()),
       channel_(channel) {}
 
 VideoRtpSender::~VideoRtpSender() {
   Stop();
 }
 
 void VideoRtpSender::OnChanged() {
   TRACE_EVENT0("webrtc", "VideoRtpSender::OnChanged");
   RTC_DCHECK(!stopped_);
-  if (cached_track_enabled_ != track_->enabled()) {
+  if (cached_track_enabled_ != track_->enabled() ||
+      cached_track_content_hint_ != track_->content_hint()) {
     cached_track_enabled_ = track_->enabled();
+    cached_track_content_hint_ = track_->content_hint();
     if (can_send_track()) {
       SetVideoSend();
     }
   }
 }
 
 bool VideoRtpSender::SetTrack(MediaStreamTrackInterface* track) {
   TRACE_EVENT0("webrtc", "VideoRtpSender::SetTrack");
   if (stopped_) {
     LOG(LS_ERROR) << "SetTrack can't be called on a stopped RtpSender.";
@@ skipping 12 matching lines @@
   }
 
   // Attach to new track.
   bool prev_can_send_track = can_send_track();
   // Keep a reference to the old track to keep it alive until we call
   // SetVideoSend.
   rtc::scoped_refptr<VideoTrackInterface> old_track = track_;
   track_ = video_track;
   if (track_) {
     cached_track_enabled_ = track_->enabled();
+    cached_track_content_hint_ = track_->content_hint();
     track_->RegisterObserver(this);
   }
 
   // Update video channel.
   if (can_send_track()) {
     SetVideoSend();
   } else if (prev_can_send_track) {
     ClearVideoSend();
   }
   return true;
@@ skipping 49 matching lines @@
   if (!channel_) {
     LOG(LS_ERROR) << "SetVideoSend: No video channel exists.";
     return;
   }
   cricket::VideoOptions options;
   VideoTrackSourceInterface* source = track_->GetSource();
   if (source) {
     options.is_screencast = rtc::Optional<bool>(source->is_screencast());
     options.video_noise_reduction = source->needs_denoising();
   }
+  switch (cached_track_content_hint_) {
+    case VideoTrackInterface::ContentHint::kNone:
+      break;
+    case VideoTrackInterface::ContentHint::kFluid:
+      options.is_screencast = rtc::Optional<bool>(false);
+      break;
+    case VideoTrackInterface::ContentHint::kDetailed:
+      options.is_screencast = rtc::Optional<bool>(true);
+      break;
+  }
   if (!channel_->SetVideoSend(ssrc_, track_->enabled(), &options, track_)) {
     RTC_DCHECK(false);
   }
 }
 
 void VideoRtpSender::ClearVideoSend() {
   RTC_DCHECK(ssrc_ != 0);
   RTC_DCHECK(!stopped_);
   if (!channel_) {
     LOG(LS_WARNING) << "SetVideoSend: No video channel exists.";
     return;
   }
   // Allow SetVideoSend to fail since |enable| is false and |source| is null.
   // This the normal case when the underlying media channel has already been
   // deleted.
   channel_->SetVideoSend(ssrc_, false, nullptr, nullptr);
 }
 
 }  // namespace webrtc