Added setFocusSelectedSource to DesktopCapturer and capture with DesktopAndCursorComposer

Author: devopvoid

webrtc-jni/src/main/cpp/include/JNI_DesktopCapturer.h

@@ -42,11 +42,14 @@ namespace jni
 			bool GetSourceList(SourceList * sources) override;
 			bool SelectSource(SourceId id) override;
 			bool FocusOnSelectedSource() override;
+			void setFocusSelectedSource(bool focus);
 			bool IsOccluded(const webrtc::DesktopVector & pos) override;
 
 		protected:
 			std::unique_ptr<webrtc::DesktopCapturer> capturer;
 
+			bool focusSelectedSource;
+
 #if defined(WEBRTC_WIN)
 		private:
 			ComInitializer comInitializer;

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

@@ -76,6 +76,15 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_video_desktop_DesktopCapture
 	}
 }
 
+JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_video_desktop_DesktopCapturer_setFocusSelectedSource
+(JNIEnv * env, jobject caller, jboolean focus)
+{
+	jni::DesktopCapturer * capturer = GetHandle<jni::DesktopCapturer>(env, caller);
+	CHECK_HANDLE(capturer);
+
+	capturer->setFocusSelectedSource(focus);
+}
+
 JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_video_desktop_DesktopCapturer_start
 (JNIEnv * env, jobject caller, jobject jcallback)
 {

webrtc-jni/src/main/cpp/src/JNI_DesktopCapturer.cpp

@@ -54,7 +54,7 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_video_VideoDesktopSource_set
 JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_video_VideoDesktopSource_setFocusSelectedSource
 (JNIEnv * env, jobject caller, jboolean focus)
 {
-	jni::VideoTrackDesktopSource* videoSource = GetHandle<jni::VideoTrackDesktopSource>(env, caller);
+	jni::VideoTrackDesktopSource * videoSource = GetHandle<jni::VideoTrackDesktopSource>(env, caller);
 	CHECK_HANDLE(videoSource);
 
 	videoSource->setFocusSelectedSource(focus);

webrtc-jni/src/main/cpp/src/JNI_VideoDesktopSource.cpp

@@ -18,13 +18,15 @@
 
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "modules/desktop_capture/desktop_capture_options.h"
+#include "modules/desktop_capture/desktop_and_cursor_composer.h"
 
 namespace jni
 {
-	DesktopCapturer::DesktopCapturer(bool screenCapturer)
+	DesktopCapturer::DesktopCapturer(bool screenCapturer) :
+		focusSelectedSource(false)
 	{
 		auto options = webrtc::DesktopCaptureOptions::CreateDefault();
-		// Disable desktop effects.
+		// Enable desktop effects.
 		options.set_disable_effects(false);
 
 #if defined(WEBRTC_WIN)
@@ -33,10 +35,14 @@ namespace jni
 #endif
 
 		if (screenCapturer) {
-			capturer = webrtc::DesktopCapturer::CreateScreenCapturer(options);
+			capturer.reset(new webrtc::DesktopAndCursorComposer(
+				webrtc::DesktopCapturer::CreateScreenCapturer(options),
+				options));
 		}
 		else {
-			capturer = webrtc::DesktopCapturer::CreateWindowCapturer(options);
+			capturer.reset(new webrtc::DesktopAndCursorComposer(
+				webrtc::DesktopCapturer::CreateWindowCapturer(options),
+				options));
 		}
 	}
 
@@ -48,6 +54,10 @@ namespace jni
 	void DesktopCapturer::Start(Callback * callback)
 	{
 		capturer->Start(callback);
+
+		if (focusSelectedSource) {
+			capturer->FocusOnSelectedSource();
+		}
 	}
 
 	void DesktopCapturer::SetSharedMemoryFactory(std::unique_ptr<webrtc::SharedMemoryFactory> factory)
@@ -80,6 +90,11 @@ namespace jni
 		return capturer->FocusOnSelectedSource();
 	}
 
+	void DesktopCapturer::setFocusSelectedSource(bool focus)
+	{
+		this->focusSelectedSource = focus;
+	}
+
 	bool DesktopCapturer::IsOccluded(const webrtc::DesktopVector & pos)
 	{
 		return capturer->IsOccluded(pos);

webrtc-jni/src/main/cpp/src/media/video/desktop/DesktopCapturer.cpp

@@ -63,6 +63,8 @@ public enum Result {
 
 	public native void selectSource(DesktopSource source);
 
+	public native void setFocusSelectedSource(boolean focus);
+
 	public native void start(DesktopCaptureCallback callback);
 
 	public native void captureFrame();