refactor: VideoTrackDesktopSource extends AdaptedVideoTrackSource

Author: devopvoid

webrtc-jni/src/main/cpp/include/media/video/VideoTrackDesktopSource.h

@@ -18,81 +18,57 @@
 #define JNI_WEBRTC_MEDIA_VIDEO_TRACK_DESKTOP_SOURCE_H_
 
 #include "api/video/i420_buffer.h"
-#include "api/video/video_frame.h"
-#include "api/video/video_sink_interface.h"
-#include "media/base/video_adapter.h"
-#include "media/base/video_broadcaster.h"
-#include "pc/video_track_source.h"
+#include "media/base/adapted_video_track_source.h"
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "rtc_base/thread.h"
 
 namespace jni
 {
-	class VideoTrackDesktopSource : public webrtc::VideoTrackSource, public webrtc::DesktopCapturer::Callback
+	class VideoTrackDesktopSource : public rtc::AdaptedVideoTrackSource, public webrtc::DesktopCapturer::Callback
 	{
-		public:
-			VideoTrackDesktopSource();
-			~VideoTrackDesktopSource();
+	public:
+		VideoTrackDesktopSource();
+		~VideoTrackDesktopSource();
 
-			void setSourceId(webrtc::DesktopCapturer::SourceId source, bool isWindow);
-			void setFrameRate(const uint16_t frameRate);
-			void setMaxFrameSize(webrtc::DesktopSize size);
-			void setFocusSelectedSource(bool focus);
+		void setSourceId(webrtc::DesktopCapturer::SourceId source, bool isWindow);
+		void setFrameRate(const uint16_t frameRate);
+		void setMaxFrameSize(webrtc::DesktopSize size);
+		void setFocusSelectedSource(bool focus);
 
-			void start();
-			void stop();
-			void terminate();
+		void start();
+		void stop();
+		void terminate();
 
-			// VideoSourceInterface implementation.
-			void AddOrUpdateSink(rtc::VideoSinkInterface<webrtc::VideoFrame> * sink, const rtc::VideoSinkWants & wants) override;
-			void RemoveSink(rtc::VideoSinkInterface<webrtc::VideoFrame> * sink) override;
+		// AdaptedVideoTrackSource implementation.
+		virtual bool is_screencast() const override;
+		virtual std::optional<bool> needs_denoising() const override;
+		SourceState state() const override;
+		bool remote() const override;
 
-			// VideoTrackSource implementation.
-			rtc::VideoSourceInterface<webrtc::VideoFrame>* source() override;
+		// DesktopCapturer::Callback implementation.
+		void OnCaptureResult(webrtc::DesktopCapturer::Result result, std::unique_ptr<webrtc::DesktopFrame> frame) override;
 
-			// VideoTrackSourceInterface implementation.
-			bool GetStats(webrtc::VideoTrackSourceInterface::Stats * stats) override;
-			void ProcessConstraints(const webrtc::VideoTrackSourceConstraints & constraints) override;
-			virtual bool is_screencast() const override;
-			virtual std::optional<bool> needs_denoising() const override;
-			SourceState state() const override;
-			bool remote() const override;
+	private:
+		void capture();
+		void process(std::unique_ptr<webrtc::DesktopFrame>& frame);
 
-			// DesktopCapturer::Callback implementation.
-			void OnCaptureResult(webrtc::DesktopCapturer::Result result, std::unique_ptr<webrtc::DesktopFrame> frame) override;
+	private:
+		uint16_t frameRate;
+		bool isCapturing;
+		bool focusSelectedSource;
 
-		protected:
-			bool AdaptFrame(int width, int height, int64_t time_us, int* out_width, int* out_height, int* crop_width, int* crop_height, int* crop_x, int* crop_y);
-			void OnFrameDropped();
+		webrtc::DesktopSize maxFrameSize;
 
-		private:
-			void capture();
-			void process(std::unique_ptr<webrtc::DesktopFrame> & frame);
-			void updateVideoAdapter();
+		webrtc::MediaSourceInterface::SourceState sourceState;
 
-		private:
-			uint16_t frameRate;
-			bool isCapturing;
-			bool focusSelectedSource;
+		webrtc::DesktopCapturer::SourceId sourceId;
+		bool sourceIsWindow;
 
-			webrtc::DesktopSize maxFrameSize;
+		std::unique_ptr<webrtc::DesktopFrame> lastFrame;
 
-			rtc::VideoBroadcaster broadcaster;
-			cricket::VideoAdapter videoAdapter;
+		std::unique_ptr<rtc::Thread> captureThread;
 
-			webrtc::MediaSourceInterface::SourceState sourceState;
-
-			webrtc::DesktopCapturer::SourceId sourceId;
-			bool sourceIsWindow;
-
-			std::unique_ptr<webrtc::DesktopFrame> lastFrame;
-
-			std::unique_ptr<rtc::Thread> captureThread;
-
-			rtc::scoped_refptr<webrtc::I420Buffer> buffer;
-
-			webrtc::Mutex statsMutex;
-			std::optional<Stats> stats RTC_GUARDED_BY(statsMutex);
+		rtc::scoped_refptr<webrtc::I420Buffer> buffer;
 	};
 }
 

webrtc-jni/src/main/cpp/src/media/video/VideoTrackDesktopSource.cpp

@@ -33,7 +33,7 @@
 namespace jni
 {
 	VideoTrackDesktopSource::VideoTrackDesktopSource() :
-		VideoTrackSource(/*remote=*/false),
+		AdaptedVideoTrackSource(),
 		frameRate(20),
 		isCapturing(false),
 		focusSelectedSource(true),
@@ -88,104 +88,29 @@ namespace jni
 		}
 	}
 
-	void VideoTrackDesktopSource::AddOrUpdateSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink, const rtc::VideoSinkWants& wants)
-	{
-		if (wants.is_active) {
-			broadcaster.AddOrUpdateSink(sink, wants);
-
-			updateVideoAdapter();
-		}
-	}
-
-	void VideoTrackDesktopSource::RemoveSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink)
-	{
-		broadcaster.RemoveSink(sink);
-
-		updateVideoAdapter();
-	}
-
-	void VideoTrackDesktopSource::updateVideoAdapter()
-	{
-		videoAdapter.OnSinkWants(broadcaster.wants());
-	}
-
-	void VideoTrackDesktopSource::OnFrameDropped()
-	{
-		broadcaster.OnDiscardedFrame();
-	}
-
-	rtc::VideoSourceInterface<webrtc::VideoFrame>* VideoTrackDesktopSource::source()
-	{
-		return this;
-	}
-
 	void VideoTrackDesktopSource::terminate()
 	{
 		// Notify the track that we are permanently done.
 		sourceState = kEnded;
 		FireOnChanged();
 	}
 
-	bool VideoTrackDesktopSource::GetStats(webrtc::VideoTrackSourceInterface::Stats * stats)
-	{
-		webrtc::MutexLock lock(&statsMutex);
-
-		if (!stats) {
-			return false;
-		}
-
-		*stats = *stats;
-
+	bool VideoTrackDesktopSource::is_screencast() const {
 		return true;
 	}
 
-	void VideoTrackDesktopSource::ProcessConstraints(const webrtc::VideoTrackSourceConstraints & constraints)
-	{
-		broadcaster.ProcessConstraints(constraints);
-	}
-
-	bool VideoTrackDesktopSource::is_screencast() const
-	{
-		return true;
-	}
-
-	std::optional<bool> VideoTrackDesktopSource::needs_denoising() const
-	{
+	std::optional<bool> VideoTrackDesktopSource::needs_denoising() const {
 		return false;
 	}
 
-	webrtc::MediaSourceInterface::SourceState VideoTrackDesktopSource::state() const
-	{
+	webrtc::MediaSourceInterface::SourceState VideoTrackDesktopSource::state() const {
 		return sourceState;
 	}
 
-	bool VideoTrackDesktopSource::remote() const
-	{
+	bool VideoTrackDesktopSource::remote() const {
 		return false;
 	}
 
-	bool VideoTrackDesktopSource::AdaptFrame(int width, int height, int64_t time_us, int* out_width, int* out_height, int* crop_width, int* crop_height, int* crop_x, int* crop_y)
-	{
-		{
-			webrtc::MutexLock lock(&statsMutex);
-			stats = Stats{ width, height };
-		}
-
-		if (!broadcaster.frame_wanted()) {
-			return false;
-		}
-
-		if (!videoAdapter.AdaptFrameResolution(width, height, time_us * rtc::kNumNanosecsPerMicrosec, crop_width, crop_height, out_width, out_height)) {
-			broadcaster.OnDiscardedFrame();
-			return false;
-		}
-
-		*crop_x = (width - *crop_width) / 2;
-		*crop_y = (height - *crop_height) / 2;
-		
-		return true;
-	}
-
 	void VideoTrackDesktopSource::OnCaptureResult(webrtc::DesktopCapturer::Result result, std::unique_ptr<webrtc::DesktopFrame> frame)
 	{
 		if (result != webrtc::DesktopCapturer::Result::SUCCESS) {
@@ -195,7 +120,7 @@ namespace jni
 				terminate();
 				stop();
 			}
-			
+
 			return;
 		}
 
@@ -217,15 +142,15 @@ namespace jni
 		}
 	}
 
-	void VideoTrackDesktopSource::process(std::unique_ptr<webrtc::DesktopFrame> & frame)
+	void VideoTrackDesktopSource::process(std::unique_ptr<webrtc::DesktopFrame>& frame)
 	{
 		int64_t time = rtc::TimeMicros();
 
 		int width = frame->size().width();
 		int height = frame->size().height();
-		
-		int adapted_width = width;
-		int adapted_height = height;
+
+		int adapted_width;
+		int adapted_height;
 
 		int crop_x = 0;
 		int crop_y = 0;
@@ -291,19 +216,18 @@ namespace jni
 
 				scaled_buffer->ScaleFrom(*buffer);
 
-				broadcaster.OnFrame(webrtc::VideoFrame::Builder()
+				OnFrame(webrtc::VideoFrame::Builder()
 					.set_video_frame_buffer(scaled_buffer)
 					.set_rotation(webrtc::kVideoRotation_0)
 					.set_timestamp_us(time)
 					.build());
 			}
 			else {
 				// No adaptations needed, just return the frame as is.
-				broadcaster.OnFrame(webrtc::VideoFrame::Builder()
+				OnFrame(webrtc::VideoFrame::Builder()
 					.set_video_frame_buffer(buffer)
 					.set_rotation(webrtc::kVideoRotation_0)
 					.set_timestamp_us(time)
-					.set_timestamp_rtp(0)
 					.build());
 			}
 		}