Title: [264815] trunk
- Revision
- 264815
- Author
- [email protected]
- Date
- 2020-07-24 03:06:36 -0700 (Fri, 24 Jul 2020)
Log Message
Remove assertions in RTCVideoEncoderH264 that are wrong in case of simulcast
https://bugs.webkit.org/show_bug.cgi?id=214684
Reviewed by Darin Adler.
Source/ThirdParty/libwebrtc:
* Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm:
(-[RTCVideoEncoderH264 encode:codecSpecificInfo:frameTypes:]):
In case of simulcast, the session expected width/height and samples width/height are not matching.
This is expected and the session handles it properly.
LayoutTests:
* platform/mac-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (264814 => 264815)
--- trunk/LayoutTests/ChangeLog 2020-07-24 09:58:46 UTC (rev 264814)
+++ trunk/LayoutTests/ChangeLog 2020-07-24 10:06:36 UTC (rev 264815)
@@ -1,3 +1,12 @@
+2020-07-24 Youenn Fablet <[email protected]>
+
+ Remove assertions in RTCVideoEncoderH264 that are wrong in case of simulcast
+ https://bugs.webkit.org/show_bug.cgi?id=214684
+
+ Reviewed by Darin Adler.
+
+ * platform/mac-wk2/TestExpectations:
+
2020-07-23 James Darpinian <[email protected]>
[WebGL2] Query Objects
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (264814 => 264815)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-07-24 09:58:46 UTC (rev 264814)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-07-24 10:06:36 UTC (rev 264815)
@@ -1073,7 +1073,6 @@
webkit.org/b/214478 [ Debug ] imported/w3c/web-platform-tests/webrtc/RTCSctpTransport-constructor.html [ Skip ]
webkit.org/b/214478 [ Debug ] imported/w3c/web-platform-tests/webrtc/idlharness.https.window.html [ Skip ]
webkit.org/b/214478 [ Debug ] tiled-drawing/scrolling/fast-scroll-iframe-latched-select.html [ Skip ]
-webkit.org/b/214478 [ Debug ] webrtc/simulcast-h264.html [ Skip ]
webkit.org/b/214574 [ Release ] svg/animations/smil-leak-list-property-instances.svg [ Pass Failure ]
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (264814 => 264815)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-07-24 09:58:46 UTC (rev 264814)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-07-24 10:06:36 UTC (rev 264815)
@@ -1,3 +1,15 @@
+2020-07-24 Youenn Fablet <[email protected]>
+
+ Remove assertions in RTCVideoEncoderH264 that are wrong in case of simulcast
+ https://bugs.webkit.org/show_bug.cgi?id=214684
+
+ Reviewed by Darin Adler.
+
+ * Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm:
+ (-[RTCVideoEncoderH264 encode:codecSpecificInfo:frameTypes:]):
+ In case of simulcast, the session expected width/height and samples width/height are not matching.
+ This is expected and the session handles it properly.
+
2020-07-22 Conrad Shultz <[email protected]>
Update macOS Version macros
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm (264814 => 264815)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm 2020-07-24 09:58:46 UTC (rev 264814)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm 2020-07-24 10:06:36 UTC (rev 264815)
@@ -425,8 +425,6 @@
- (NSInteger)encode:(RTCVideoFrame *)frame
codecSpecificInfo:(nullable id<RTCCodecSpecificInfo>)codecSpecificInfo
frameTypes:(NSArray<NSNumber *> *)frameTypes {
- RTC_DCHECK_EQ(frame.width, _width);
- RTC_DCHECK_EQ(frame.height, _height);
if (!_callback || ![self hasCompressionSession]) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
