Skip to content

Commit 7d37d7b

Browse files
committed
fix(VideoManager): keep WebSocket stack independent
1 parent 263e978 commit 7d37d7b

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

src/VideoManager/VideoReceiver/GStreamer/GstSourceFactory.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,7 @@ GstElement* buildHttpMjpegSource(const QUrl& sourceUrl, const Config& config)
538538
GstElement* buildWebSocketJpegSource(const QUrl& sourceUrl)
539539
{
540540
if (!sourceUrl.isValid() || sourceUrl.isRelative() || sourceUrl.host().isEmpty() || (sourceUrl.port() == 0)) {
541-
qCWarning(GstSourceFactoryLog) << "Invalid WebSocket JPEG URL:"
542-
<< QGCNetworkHelper::redactedUrlForLogging(sourceUrl);
541+
qCWarning(GstSourceFactoryLog) << "Invalid WebSocket JPEG URL";
543542
return nullptr;
544543
}
545544
if (!sourceUrl.userInfo().isEmpty()) {

src/VideoManager/VideoReceiver/GStreamer/QGCWebSocketVideoSource.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,11 @@ class WebSocketWorker final : public QObject
167167
_webSocket->setSslConfiguration(QGCNetworkHelper::createSslConfig());
168168
}
169169

170-
(void) connect(_webSocket, &QWebSocket::connected, this, [this]() {
171-
qCDebug(QGCWebSocketVideoSourceLog) << "Connected" << QGCNetworkHelper::redactedUrlForLogging(_url);
170+
(void) connect(_webSocket, &QWebSocket::connected, this, []() {
171+
qCDebug(QGCWebSocketVideoSourceLog) << "Connected to WebSocket video source";
172172
});
173173
(void) connect(_webSocket, &QWebSocket::disconnected, this, [this]() {
174-
qCDebug(QGCWebSocketVideoSourceLog) << "Disconnected" << QGCNetworkHelper::redactedUrlForLogging(_url);
174+
qCDebug(QGCWebSocketVideoSourceLog) << "Disconnected from WebSocket video source";
175175
_failStream(GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_READ, "WebSocket video connection closed",
176176
QStringLiteral("Connection closed unexpectedly"));
177177
});
@@ -203,7 +203,7 @@ class WebSocketWorker final : public QObject
203203

204204
_running = true;
205205
_terminalError = false;
206-
qCDebug(QGCWebSocketVideoSourceLog) << "Opening" << QGCNetworkHelper::redactedUrlForLogging(_url);
206+
qCDebug(QGCWebSocketVideoSourceLog) << "Opening WebSocket video source";
207207
_webSocket->open(request);
208208
}
209209

0 commit comments

Comments
 (0)