Switch to WebRTC branch M80/3987

devopvoid · devopvoid · commit 5a7bba5a2cd7 · 2020-01-19T17:36:05.000+01:00
diff --git a/webrtc-jni/pom.xml b/webrtc-jni/pom.xml
@@ -12,7 +12,7 @@
 
 	<properties>
 		<download.cmake>true</download.cmake>
-		<webrtc.branch>branch-heads/m79</webrtc.branch>
+		<webrtc.branch>branch-heads/3987</webrtc.branch>
 	</properties>
 
 	<build>
diff --git a/webrtc-jni/src/media/video/VideoTrackDesktopSource.cpp b/webrtc-jni/src/media/video/VideoTrackDesktopSource.cpp
@@ -187,6 +187,6 @@ namespace jni
 	{
 		rtc::VideoSinkWants wants = broadcaster.wants();
 
-		videoAdapter.OnResolutionFramerateRequest(wants.target_pixel_count, wants.max_pixel_count, wants.max_framerate_fps);
+		videoAdapter.OnOutputFormatRequest(std::make_pair(0, 0), wants.max_pixel_count, wants.max_framerate_fps);
 	}
 }
diff --git a/webrtc-jni/src/media/video/VideoTrackDeviceSource.cpp b/webrtc-jni/src/media/video/VideoTrackDeviceSource.cpp
@@ -155,7 +155,7 @@ namespace jni
 	{
 		rtc::VideoSinkWants wants = broadcaster.wants();
 
-		videoAdapter.OnResolutionFramerateRequest(wants.target_pixel_count, wants.max_pixel_count, wants.max_framerate_fps);
+		videoAdapter.OnOutputFormatRequest(std::make_pair(capability.width, capability.height), wants.max_pixel_count, wants.max_framerate_fps);
 	}
 
 	void VideoTrackDeviceSource::OnFrame(const webrtc::VideoFrame & frame)

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,6 @@ namespace jni`
`187`	`187`	`{`
`188`	`188`	`rtc::VideoSinkWants wants = broadcaster.wants();`
`189`	`189`
`190`		`- videoAdapter.OnResolutionFramerateRequest(wants.target_pixel_count, wants.max_pixel_count, wants.max_framerate_fps);`
	`190`	`+ videoAdapter.OnOutputFormatRequest(std::make_pair(0, 0), wants.max_pixel_count, wants.max_framerate_fps);`
`191`	`191`	`}`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ namespace jni`
`155`	`155`	`{`
`156`	`156`	`rtc::VideoSinkWants wants = broadcaster.wants();`
`157`	`157`
`158`		`- videoAdapter.OnResolutionFramerateRequest(wants.target_pixel_count, wants.max_pixel_count, wants.max_framerate_fps);`
	`158`	`+ videoAdapter.OnOutputFormatRequest(std::make_pair(capability.width, capability.height), wants.max_pixel_count, wants.max_framerate_fps);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`void VideoTrackDeviceSource::OnFrame(const webrtc::VideoFrame & frame)`