Make cricket::VideoCapturer implement VideoSourceInterface

talk/media/base/videocapturer.h

 /*
  * libjingle
  * Copyright 2010 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 20 matching lines @@
 #define TALK_MEDIA_BASE_VIDEOCAPTURER_H_
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/videoadapter.h"
 #include "talk/media/base/videocommon.h"
 #include "talk/media/base/videoframefactory.h"
+#include "talk/media/base/videosourcebase.h"
 #include "talk/media/devices/devicemanager.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/media/base/videosourceinterface.h"
 #include "webrtc/base/messagehandler.h"
 #include "webrtc/base/rollingaccumulator.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/timing.h"
 
 
 namespace cricket {
 
@@ skipping 29 matching lines @@
   // fourcc, pixel_width, and pixel_height should keep the same over frames.
   int width;              // in number of pixels
   int height;             // in number of pixels
   uint32_t fourcc;        // compression
   uint32_t pixel_width;   // width of a pixel, default is 1
   uint32_t pixel_height;  // height of a pixel, default is 1
   int64_t time_stamp;  // timestamp of when the frame was captured, in unix
                        // time with nanosecond units.
   uint32_t data_size;  // number of bytes of the frame data
 
-  webrtc::VideoRotation rotation; // rotation in degrees of the frame.
+  webrtc::VideoRotation rotation;  // rotation in degrees of the frame.
 
   void*  data;          // pointer to the frame data. This object allocates the
                         // memory or points to an existing memory.
 
  private:
   RTC_DISALLOW_COPY_AND_ASSIGN(CapturedFrame);
 };
 
 // VideoCapturer is an abstract class that defines the interfaces for video
 // capturing. The subclasses implement the video capturer for various types of
@@ skipping 14 matching lines @@
 //   video_adapter()->OnOutputFormatRequest(desired_encoding_format)
 //   Start()
 //   GetCaptureFormat() optionally
 //   Stop()
 //
 // Assumption:
 //   The Start() and Stop() methods are called by a single thread (E.g., the
 //   media engine thread). Hence, the VideoCapture subclasses dont need to be
 //   thread safe.
 //
-class VideoCapturer
-    : public sigslot::has_slots<>,
-      public rtc::MessageHandler {
+class VideoCapturer : public sigslot::has_slots<>,
+                      public rtc::MessageHandler,
+                      public rtc::VideoSourceBase {

[pthatcher1, 2016/02/03 15:38:35]

Can we try making this "has a muxer" rather than "is a muxer"?  In other words,
instead of inheriting from VideoSourceBase, containing a VideoBrodacaster (or
whatever we call it).

  public:
   // All signals are marshalled to |thread| or the creating thread if
   // none is provided.
   VideoCapturer();
   explicit VideoCapturer(rtc::Thread* thread);
   virtual ~VideoCapturer() {}
 
   // Gets the id of the underlying device, which is available after the capturer
   // is initialized. Can be used to determine if two capturers reference the
   // same device.
@@ skipping 66 matching lines @@
   // When muting, produce black frames then pause the camera.
   // When unmuting, start the camera. Camera starts unmuted.
   virtual bool MuteToBlackThenPause(bool muted);
   virtual bool IsMuted() const {
     return muted_;
   }
   CaptureState capture_state() const {
     return capture_state_;
   }
 
-  // Tells videocapturer whether to apply the pending rotation. By default, the
-  // rotation is applied and the generated frame is up right. When set to false,
-  // generated frames will carry the rotation information from
-  // SetCaptureRotation. Return value indicates whether this operation succeeds.
-  virtual bool SetApplyRotation(bool enable);
+  void OnSinkCapabilitiesChanged(
+      const rtc::VideoSinkCapabilities& capabilities) override;
+
   virtual bool GetApplyRotation() { return apply_rotation_; }
 
   // Returns true if the capturer is screencasting. This can be used to
   // implement screencast specific behavior.
   virtual bool IsScreencast() const = 0;
 
   // Caps the VideoCapturer's format according to max_format. It can e.g. be
   // used to prevent cameras from capturing at a resolution or framerate that
   // the capturer is capable of but not performing satisfactorily at.
   // The capping is an upper bound for each component of the capturing format.
@@ skipping 18 matching lines @@
   // Signal all capture state changes that are not a direct result of calling
   // Start().
   sigslot::signal2<VideoCapturer*, CaptureState> SignalStateChange;
   // Frame callbacks are multithreaded to allow disconnect and connect to be
   // called concurrently. It also ensures that it is safe to call disconnect
   // at any time which is needed since the signal may be called from an
   // unmarshalled thread owned by the VideoCapturer.
   // Signal the captured frame to downstream.
   sigslot::signal2<VideoCapturer*, const CapturedFrame*,
                    sigslot::multi_threaded_local> SignalFrameCaptured;
-  // Signal the captured and possibly adapted frame to downstream consumers
-  // such as the encoder.
-  sigslot::signal2<VideoCapturer*, const VideoFrame*,
-                   sigslot::multi_threaded_local> SignalVideoFrame;
 
   // If true, run video adaptation. By default, video adaptation is enabled
   // and users must call video_adapter()->OnOutputFormatRequest()
   // to receive frames.
   bool enable_video_adapter() const { return enable_video_adapter_; }
   void set_enable_video_adapter(bool enable_video_adapter) {
     enable_video_adapter_ = enable_video_adapter;
   }
 
   CoordinatedVideoAdapter* video_adapter() { return &video_adapter_; }
@@ skipping 102 matching lines @@
 
   // Whether capturer should apply rotation to the frame before signaling it.
   bool apply_rotation_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_VIDEOCAPTURER_H_