Revert of Make cricket::VideoCapturer implement VideoSourceInterface

webrtc/api/androidvideocapturer.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.
  */
 
 #include "webrtc/api/androidvideocapturer.h"
 
 #include "webrtc/api/java/jni/native_handle_impl.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/json.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/media/webrtc/webrtcvideoframe.h"
 
 namespace webrtc {
 
 // A hack for avoiding deep frame copies in
 // cricket::VideoCapturer.SignalFrameCaptured() using a custom FrameFactory.
 // A frame is injected using UpdateCapturedFrame(), and converted into a
 // cricket::VideoFrame with CreateAliasedFrame(). UpdateCapturedFrame() should
 // be called before CreateAliasedFrame() for every frame.
 // TODO(magjed): Add an interface cricket::VideoCapturer::OnFrameCaptured()
 // for ref counted I420 frames instead of this hack.
 class AndroidVideoCapturer::FrameFactory : public cricket::VideoFrameFactory {
  public:
-  explicit FrameFactory(
-      const rtc::scoped_refptr<AndroidVideoCapturerDelegate>& delegate)
+  FrameFactory(const rtc::scoped_refptr<AndroidVideoCapturerDelegate>& delegate)
       : delegate_(delegate) {
     // Create a CapturedFrame that only contains header information, not the
     // actual pixel data.
     captured_frame_.pixel_height = 1;
     captured_frame_.pixel_width = 1;
     captured_frame_.data = nullptr;
     captured_frame_.data_size = cricket::CapturedFrame::kUnknownDataSize;
     captured_frame_.fourcc = static_cast<uint32_t>(cricket::FOURCC_ANY);
   }
 
@@ skipping 93 matching lines @@
                 !json_value["height"].isNull() &&
                 !json_value["framerate"].isNull());
       cricket::VideoFormat format(
           json_value["width"].asInt(),
           json_value["height"].asInt(),
           cricket::VideoFormat::FpsToInterval(json_value["framerate"].asInt()),
           cricket::FOURCC_YV12);
       formats.push_back(format);
   }
   SetSupportedFormats(formats);
+  // Do not apply frame rotation by default.
+  SetApplyRotation(false);
 }
 
 AndroidVideoCapturer::~AndroidVideoCapturer() {
   RTC_CHECK(!running_);
 }
 
 cricket::CaptureState AndroidVideoCapturer::Start(
     const cricket::VideoFormat& capture_format) {
   RTC_CHECK(thread_checker_.CalledOnValidThread());
   RTC_CHECK(!running_);
@@ skipping 69 matching lines @@
 
 bool AndroidVideoCapturer::GetBestCaptureFormat(
     const cricket::VideoFormat& desired,
     cricket::VideoFormat* best_format) {
   // Delegate this choice to VideoCapturerAndroid.startCapture().
   *best_format = desired;
   return true;
 }
 
 }  // namespace webrtc