New helper class AdaptedVideoSource.

webrtc/media/base/videocapturer.cc

 /*
  *  Copyright (c) 2010 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 52 matching lines @@
   thread_checker_.DetachFromThread();
   Construct();
 }
 
 void VideoCapturer::Construct() {
   enable_camera_list_ = false;
   capture_state_ = CS_STOPPED;
   SignalFrameCaptured.connect(this, &VideoCapturer::OnFrameCaptured);
   scaled_width_ = 0;
   scaled_height_ = 0;
-  enable_video_adapter_ = true;
   // There are lots of video capturers out there that don't call
   // set_frame_factory.  We can either go change all of them, or we
   // can set this default.
   // TODO(pthatcher): Remove this hack and require the frame factory
   // to be passed in the constructor.
   set_frame_factory(new WebRtcVideoFrameFactory());
 }
 
 const std::vector<VideoFormat>* VideoCapturer::GetSupportedFormats() const {
   return &filtered_supported_formats_;
@@ skipping 77 matching lines @@
       fourcc_name = "";
       break;
     }
   }
 
   std::ostringstream ss;
   ss << fourcc_name << captured_frame->width << "x" << captured_frame->height;
   return ss.str();
 }
 
+bool VideoCapturer::enable_video_adapter() const {
+  return !IsScreencast() && adapted_source_.enable_video_adapter();
+}
+void VideoCapturer::set_enable_video_adapter(bool enable_video_adapter) {
+  adapted_source_.set_enable_video_adapter(
+      enable_video_adapter && !IsScreencast());
+}
+
 void VideoCapturer::set_frame_factory(VideoFrameFactory* frame_factory) {
   frame_factory_.reset(frame_factory);
   if (frame_factory) {
     frame_factory->SetApplyRotation(apply_rotation_);
   }
 }
 
 bool VideoCapturer::GetInputSize(int* width, int* height) {
   rtc::CritScope cs(&frame_stats_crit_);
   if (!input_size_valid_) {
     return false;
   }
   *width = input_width_;
   *height = input_height_;
 
   return true;
 }
 
 void VideoCapturer::RemoveSink(
     rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  broadcaster_.RemoveSink(sink);
-  OnSinkWantsChanged(broadcaster_.wants());
+  adapted_source_.RemoveSink(sink);
+  OnSinkWantsChanged(adapted_source_.wants());
 }
 
 void VideoCapturer::AddOrUpdateSink(
     rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
     const rtc::VideoSinkWants& wants) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  broadcaster_.AddOrUpdateSink(sink, wants);
-  OnSinkWantsChanged(broadcaster_.wants());
+  adapted_source_.AddOrUpdateSink(sink, wants);
+  OnSinkWantsChanged(adapted_source_.wants());
 }
 
 void VideoCapturer::OnSinkWantsChanged(const rtc::VideoSinkWants& wants) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   apply_rotation_ = wants.rotation_applied;
   if (frame_factory_) {
     frame_factory_->SetApplyRotation(apply_rotation_);
   }
-
-  if (video_adapter()) {
-    video_adapter()->OnResolutionRequest(wants.max_pixel_count,
-                                         wants.max_pixel_count_step_up);
-  }
-}
-
-bool VideoCapturer::AdaptFrame(int width,
-                               int height,
-                               int64_t camera_time_us,
-                               int64_t system_time_us,
-                               int* out_width,
-                               int* out_height,
-                               int* crop_width,
-                               int* crop_height,
-                               int* crop_x,
-                               int* crop_y,
-                               int64_t* translated_camera_time_us) {
-  int64_t offset_us =
-      translated_camera_time_us
-          ? timestamp_aligner_.UpdateOffset(camera_time_us, system_time_us)
-          : 0;
-
-  if (!broadcaster_.frame_wanted()) {
-    return false;
-  }
-
-  if (enable_video_adapter_ && !IsScreencast()) {
-    if (!video_adapter_.AdaptFrameResolution(
-            width, height, camera_time_us * rtc::kNumNanosecsPerMicrosec,
-            crop_width, crop_height, out_width, out_height)) {
-      // VideoAdapter dropped the frame.
-      return false;
-    }
-    *crop_x = (width - *crop_width) / 2;
-    *crop_y = (height - *crop_height) / 2;
-  } else {
-    *out_width = width;
-    *out_height = height;
-    *crop_width = width;
-    *crop_height = height;
-    *crop_x = 0;
-    *crop_y = 0;
-  }
-
-  if (translated_camera_time_us) {
-    *translated_camera_time_us = timestamp_aligner_.ClipTimestamp(
-        camera_time_us + offset_us, system_time_us);
-  }
-  return true;
 }
 
 void VideoCapturer::OnFrameCaptured(VideoCapturer*,
                                     const CapturedFrame* captured_frame) {
   int out_width;
   int out_height;
   int crop_width;
   int crop_height;
   int crop_x;
   int crop_y;
 
   // TODO(nisse): We don't do timestamp translation on this input
   // path. It seems straight-forward to enable translation, but that
   // breaks the WebRtcVideoEngine2Test.PropagatesInputFrameTimestamp
   // test. Probably not worth the effort to fix, instead, try to
   // delete or refactor all code using VideoFrameFactory and
   // SignalCapturedFrame.
-  if (!AdaptFrame(captured_frame->width, captured_frame->height,
-                  captured_frame->time_stamp / rtc::kNumNanosecsPerMicrosec,
-                  0,
-                  &out_width, &out_height,
-                  &crop_width, &crop_height, &crop_x, &crop_y, nullptr)) {
+  if (!adapted_source_.AdaptFrame(
+          captured_frame->width, captured_frame->height,
+          captured_frame->time_stamp / rtc::kNumNanosecsPerMicrosec,
+          0,
+          &out_width, &out_height,
+          &crop_width, &crop_height, &crop_x, &crop_y, nullptr)) {
     return;
   }
 
   if (!frame_factory_) {
     LOG(LS_ERROR) << "No video frame factory.";
     return;
   }
 
   // TODO(nisse): Reorganize frame factory methods. crop_x and crop_y
   // are ignored for now.
   std::unique_ptr<VideoFrame> adapted_frame(frame_factory_->CreateAliasedFrame(
       captured_frame, crop_width, crop_height, out_width, out_height));
 
   if (!adapted_frame) {
     // TODO(fbarchard): LOG more information about captured frame attributes.
     LOG(LS_ERROR) << "Couldn't convert to I420! "
                   << "From " << ToString(captured_frame) << " To "
                   << out_width << " x " << out_height;
     return;
   }
 
   OnFrame(*adapted_frame, captured_frame->width, captured_frame->height);
 }
 
 void VideoCapturer::OnFrame(const VideoFrame& frame,
                             int orig_width,
                             int orig_height) {
-  broadcaster_.OnFrame(frame);
+  adapted_source_.OnFrame(frame);
   UpdateInputSize(orig_width, orig_height);
 }
 
 void VideoCapturer::SetCaptureState(CaptureState state) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   if (state == capture_state_) {
     // Don't trigger a state changed callback if the state hasn't changed.
     return;
   }
   capture_state_ = state;
@@ skipping 131 matching lines @@
 void VideoCapturer::UpdateInputSize(int width, int height) {
   // Update stats protected from fetches from different thread.
   rtc::CritScope cs(&frame_stats_crit_);
 
   input_size_valid_ = true;
   input_width_ = width;
   input_height_ = height;
 }
 
 }  // namespace cricket