Title: [237804] trunk
- Revision
- 237804
- Author
- [email protected]
- Date
- 2018-11-05 08:08:12 -0800 (Mon, 05 Nov 2018)
Log Message
[GStreamer][WebRTC] Error out when simulcast is activated
https://bugs.webkit.org/show_bug.cgi?id=190678
Patch by Thibault Saunier <[email protected]> on 2018-11-05
Reviewed by Philippe Normand.
Implementing it is not for now yet.
Source/WebCore:
Tests for simulcast have been disabled as they now fail (instead of crashing).
* platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp:
(WebCore::GStreamerVideoEncoder::InitEncode):
LayoutTests:
Tests for simulcast have been disabled as they now fail (instead of crashing).
* platform/gtk/TestExpectations:
* platform/wpe/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (237803 => 237804)
--- trunk/LayoutTests/ChangeLog 2018-11-05 16:07:40 UTC (rev 237803)
+++ trunk/LayoutTests/ChangeLog 2018-11-05 16:08:12 UTC (rev 237804)
@@ -1,3 +1,16 @@
+2018-11-05 Thibault Saunier <[email protected]>
+
+ [GStreamer][WebRTC] Error out when simulcast is activated
+ https://bugs.webkit.org/show_bug.cgi?id=190678
+
+ Reviewed by Philippe Normand.
+
+ Implementing it is not for now yet.
+ Tests for simulcast have been disabled as they now fail (instead of crashing).
+
+ * platform/gtk/TestExpectations:
+ * platform/wpe/TestExpectations:
+
2018-11-05 Zan Dobersek <[email protected]>
Unreviewed WPE gardening. Updating or adding various baselines. Also
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (237803 => 237804)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2018-11-05 16:07:40 UTC (rev 237803)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2018-11-05 16:08:12 UTC (rev 237804)
@@ -46,6 +46,7 @@
#////////////////////////////////////////////////////////////////////////////////////////
# The webrtc implementation is not fully completed yet
+webkit.org/b/187064 webrtc/simulcast-h264.html
webkit.org/b/189567 webrtc/video-addLegacyTransceiver.html [ Failure ]
webkit.org/b/187064 webrtc/audio-peer-connection-g722.html
webkit.org/b/187064 webrtc/video-with-receiver.html
Modified: trunk/Source/WebCore/ChangeLog (237803 => 237804)
--- trunk/Source/WebCore/ChangeLog 2018-11-05 16:07:40 UTC (rev 237803)
+++ trunk/Source/WebCore/ChangeLog 2018-11-05 16:08:12 UTC (rev 237804)
@@ -1,3 +1,17 @@
+2018-11-05 Thibault Saunier <[email protected]>
+
+ [GStreamer][WebRTC] Error out when simulcast is activated
+ https://bugs.webkit.org/show_bug.cgi?id=190678
+
+ Reviewed by Philippe Normand.
+
+ Implementing it is not for now yet.
+
+ Tests for simulcast have been disabled as they now fail (instead of crashing).
+
+ * platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp:
+ (WebCore::GStreamerVideoEncoder::InitEncode):
+
2018-11-05 Youenn Fablet <[email protected]>
RealtimeOutgoingAudioSource subclasses should observe its source when fully constructed
Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp (237803 => 237804)
--- trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp 2018-11-05 16:07:40 UTC (rev 237803)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp 2018-11-05 16:08:12 UTC (rev 237804)
@@ -31,6 +31,7 @@
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/modules/video_coding/utility/simulcast_utility.h"
#include <gst/app/gstappsink.h>
#include <gst/app/gstappsrc.h>
@@ -106,6 +107,12 @@
g_return_val_if_fail(codecSettings, WEBRTC_VIDEO_CODEC_ERR_PARAMETER);
g_return_val_if_fail(codecSettings->codecType == CodecType(), WEBRTC_VIDEO_CODEC_ERR_PARAMETER);
+ if (webrtc::SimulcastUtility::NumberOfSimulcastStreams(*codecSettings) > 1) {
+ GST_ERROR("Simulcast not supported.");
+
+ return WEBRTC_VIDEO_CODEC_ERR_SIMULCAST_PARAMETERS_NOT_SUPPORTED;
+ }
+
m_encodedFrame._size = codecSettings->width * codecSettings->height * 3;
m_encodedFrame._buffer = new uint8_t[m_encodedFrame._size];
m_encodedImageBuffer.reset(m_encodedFrame._buffer);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
