Propagate MediaStreamTrack video content hints.

content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
 
 #include "base/bind.h"
 #include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 125 matching lines @@
         (*new_frame)->visible_rect().width(),
         (*new_frame)->visible_rect().height(), libyuv::kRotate0,
         source_pixel_format);
   }
 
   const scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   scoped_refptr<ContextProviderCommandBuffer> provider_;
   std::unique_ptr<media::SkCanvasVideoRenderer> canvas_video_renderer_;
 };
 
-WebRtcVideoCapturerAdapter::WebRtcVideoCapturerAdapter(bool is_screencast)
+WebRtcVideoCapturerAdapter::WebRtcVideoCapturerAdapter(
+    bool is_screencast,
+    blink::WebMediaStreamTrack::ContentHintType content_hint)
     : texture_copier_(new WebRtcVideoCapturerAdapter::TextureFrameCopier()),
       is_screencast_(is_screencast),
+      content_hint_(content_hint),
       running_(false) {
   thread_checker_.DetachFromThread();
 }
 
 WebRtcVideoCapturerAdapter::~WebRtcVideoCapturerAdapter() {
   DVLOG(3) << __func__;
 }
 
 void WebRtcVideoCapturerAdapter::OnFrameCaptured(
     const scoped_refptr<media::VideoFrame>& input_frame) {
@@ skipping 134 matching lines @@
 bool WebRtcVideoCapturerAdapter::GetPreferredFourccs(
     std::vector<uint32_t>* fourccs) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!fourccs)
     return false;
   DCHECK(fourccs->empty());
   fourccs->push_back(cricket::FOURCC_I420);
   return true;
 }
 
+void WebRtcVideoCapturerAdapter::SetContentHint(
+    blink::WebMediaStreamTrack::ContentHintType content_hint) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  content_hint_ = content_hint;
+}
+
 bool WebRtcVideoCapturerAdapter::IsScreencast() const {
-  return is_screencast_;
+  return !ShouldAdaptResolution();
+}
+
+bool WebRtcVideoCapturerAdapter::ShouldAdaptResolution() const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (content_hint_ ==
+      blink::WebMediaStreamTrack::ContentHintType::VideoFluid) {
+    return true;
+  } else if (content_hint_ ==

[mcasas, 2016/12/19 19:32:05]

nit: no need for else{} after if(){ return }

[pbos, 2016/12/19 19:42:09]

Done.

+             blink::WebMediaStreamTrack::ContentHintType::VideoDetailed) {
+    return false;
+  }
+  // Screencast does not adapt by default.
+  return !is_screencast_;
 }
 
 bool WebRtcVideoCapturerAdapter::GetBestCaptureFormat(
     const cricket::VideoFormat& desired,
     cricket::VideoFormat* best_format) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DVLOG(3) << __func__ << " desired: " << desired.ToString();
 
   // Capability enumeration is done in MediaStreamVideoSource. The adapter can
   // just use what is provided.
   // Use the desired format as the best format.
   best_format->width = desired.width;
   best_format->height = desired.height;
   best_format->fourcc = cricket::FOURCC_I420;
   best_format->interval = desired.interval;
   return true;
 }
 
 }  // namespace content