Make cricket::VideoCapturer implement VideoSourceInterface

talk/media/webrtc/webrtcvideocapturer.cc

 /*
  * libjingle
  * Copyright 2011 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 202 matching lines @@
   if (!module_) {
     LOG(LS_ERROR) << "Failed to create capturer for id: " << device.id;
     return false;
   }
 
   // It is safe to change member attributes now.
   module_->AddRef();
   SetId(device.id);
   SetSupportedFormats(supported);
 
-  // Ensure these 2 have the same value.
-  SetApplyRotation(module_->GetApplyRotation());
-
   return true;
 }
 
 bool WebRtcVideoCapturer::Init(webrtc::VideoCaptureModule* module) {
   RTC_DCHECK(!start_thread_);
   if (module_) {
     LOG(LS_ERROR) << "The capturer is already initialized";
     return false;
   }
   if (!module) {
@@ skipping 17 matching lines @@
     best_format->width = desired.width;
     best_format->height = desired.height;
     best_format->fourcc = FOURCC_I420;
     best_format->interval = desired.interval;
     LOG(LS_INFO) << "Failed to find best capture format,"
                  << " fall back to the requested format "
                  << best_format->ToString();
   }
   return true;
 }
-bool WebRtcVideoCapturer::SetApplyRotation(bool enable) {
+void WebRtcVideoCapturer::OnSinkCapabilitiesChanged(
+    const rtc::VideoSinkCapabilities& capabilities) {
   // Can't take lock here as this will cause deadlock with
   // OnIncomingCapturedFrame. In fact, the whole method, including methods it
   // calls, can't take lock.
   RTC_DCHECK(module_);
 
   const std::string group_name =
       webrtc::field_trial::FindFullName("WebRTC-CVO");
 
   if (group_name == "Disabled") {
-    return true;
+    return;
   }
 
-  if (!VideoCapturer::SetApplyRotation(enable)) {
-    return false;
-  }
-  return module_->SetApplyRotation(enable);
+  VideoCapturer::OnSinkCapabilitiesChanged(capabilities);
+  bool result = module_->SetApplyRotation(!capabilities.can_apply_rotation);
+  RTC_CHECK(result);
+
+  return;
 }
 
 CaptureState WebRtcVideoCapturer::Start(const VideoFormat& capture_format) {
   if (!module_) {
     LOG(LS_ERROR) << "The capturer has not been initialized";
     return CS_NO_DEVICE;
   }
   if (start_thread_) {
     LOG(LS_ERROR) << "The capturer is already running";
     RTC_DCHECK(start_thread_->IsCurrent())
@@ skipping 149 matching lines @@
   // Convert units from VideoFrame RenderTimeMs to CapturedFrame (nanoseconds).
   time_stamp = sample.render_time_ms() * rtc::kNumNanosecsPerMillisec;
   data_size = rtc::checked_cast<uint32_t>(length);
   data = buffer;
   rotation = sample.rotation();
 }
 
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VIDEO