zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Log URIs besides actions for multiple stream debugging

QGC4.4
Matej Frančeškin 5 years ago committed by Andrew Voznytsa
parent
6b1f65a647
commit
9734bf5586
2 changed files with 41 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 70
      src/VideoReceiver/GstVideoReceiver.cc
  2. 1
      src/VideoReceiver/GstVideoReceiver.h

70
src/VideoReceiver/GstVideoReceiver.cc
Unescape View File

@ -79,7 +79,7 @@ GstVideoReceiver::start(const QString& uri, unsigned timeout)
} }
if(_pipeline) { if(_pipeline) {
qCDebug(VideoReceiverLog) << "Already running!"; qCDebug(VideoReceiverLog) << "Already running!" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartComplete(STATUS_INVALID_STATE); emit onStartComplete(STATUS_INVALID_STATE);
}); });
@ -94,7 +94,9 @@ GstVideoReceiver::start(const QString& uri, unsigned timeout)
return; return;
} }
qCDebug(VideoReceiverLog) << "Starting"; _uri = uri;
qCDebug(VideoReceiverLog) << "Starting" << _uri;
_endOfStream = false; _endOfStream = false;
@ -261,7 +263,7 @@ GstVideoReceiver::start(const QString& uri, unsigned timeout)
}); });
} else { } else {
GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(_pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "pipeline-started"); GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(_pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "pipeline-started");
qCDebug(VideoReceiverLog) << "Started"; qCDebug(VideoReceiverLog) << "Started" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartComplete(STATUS_OK); emit onStartComplete(STATUS_OK);
@ -279,7 +281,12 @@ GstVideoReceiver::stop(void)
return; return;
} }
qCDebug(VideoReceiverLog) << "Stopping"; if (_uri.isEmpty()) {
qCWarning(VideoReceiverLog) << "We should not be here";
return;
}
qCDebug(VideoReceiverLog) << "Stopping" << _uri;
if (_pipeline != nullptr) { if (_pipeline != nullptr) {
GstBus* bus; GstBus* bus;
@ -343,19 +350,19 @@ GstVideoReceiver::stop(void)
if (_streaming) { if (_streaming) {
_streaming = false; _streaming = false;
qCDebug(VideoReceiverLog) << "Streaming stopped"; qCDebug(VideoReceiverLog) << "Streaming stopped" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit streamingChanged(_streaming); emit streamingChanged(_streaming);
}); });
} else { } else {
qCDebug(VideoReceiverLog) << "Streaming did not start"; qCDebug(VideoReceiverLog) << "Streaming did not start" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit timeout(); emit timeout();
}); });
} }
} }
qCDebug(VideoReceiverLog) << "Stopped"; qCDebug(VideoReceiverLog) << "Stopped" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStopComplete(STATUS_OK); emit onStopComplete(STATUS_OK);
@ -366,7 +373,7 @@ void
GstVideoReceiver::startDecoding(void* sink) GstVideoReceiver::startDecoding(void* sink)
{ {
if (sink == nullptr) { if (sink == nullptr) {
qCCritical(VideoReceiverLog) << "VideoSink is NULL"; qCCritical(VideoReceiverLog) << "VideoSink is NULL" << _uri;
return; return;
} }
@ -380,7 +387,7 @@ GstVideoReceiver::startDecoding(void* sink)
return; return;
} }
qCDebug(VideoReceiverLog) << "Starting decoding"; qCDebug(VideoReceiverLog) << "Starting decoding" << _uri;
if (_pipeline == nullptr) { if (_pipeline == nullptr) {
if (_videoSink != nullptr) { if (_videoSink != nullptr) {
@ -392,7 +399,7 @@ GstVideoReceiver::startDecoding(void* sink)
GstElement* videoSink = GST_ELEMENT(sink); GstElement* videoSink = GST_ELEMENT(sink);
if(_videoSink != nullptr || _decoding) { if(_videoSink != nullptr || _decoding) {
qCDebug(VideoReceiverLog) << "Already decoding!"; qCDebug(VideoReceiverLog) << "Already decoding!" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartDecodingComplete(STATUS_INVALID_STATE); emit onStartDecodingComplete(STATUS_INVALID_STATE);
}); });
@ -402,7 +409,7 @@ GstVideoReceiver::startDecoding(void* sink)
GstPad* pad; GstPad* pad;
if ((pad = gst_element_get_static_pad(videoSink, "sink")) == nullptr) { if ((pad = gst_element_get_static_pad(videoSink, "sink")) == nullptr) {
qCCritical(VideoReceiverLog) << "Unable to find sink pad of video sink"; qCCritical(VideoReceiverLog) << "Unable to find sink pad of video sink" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartDecodingComplete(STATUS_FAIL); emit onStartDecodingComplete(STATUS_FAIL);
}); });
@ -429,7 +436,7 @@ GstVideoReceiver::startDecoding(void* sink)
} }
if (!_addDecoder(_decoderValve)) { if (!_addDecoder(_decoderValve)) {
qCCritical(VideoReceiverLog) << "_addDecoder() failed"; qCCritical(VideoReceiverLog) << "_addDecoder() failed" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartDecodingComplete(STATUS_FAIL); emit onStartDecodingComplete(STATUS_FAIL);
}); });
@ -438,7 +445,7 @@ GstVideoReceiver::startDecoding(void* sink)
g_object_set(_decoderValve, "drop", FALSE, nullptr); g_object_set(_decoderValve, "drop", FALSE, nullptr);
qCDebug(VideoReceiverLog) << "Decoding started"; qCDebug(VideoReceiverLog) << "Decoding started" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartDecodingComplete(STATUS_OK); emit onStartDecodingComplete(STATUS_OK);
@ -455,11 +462,11 @@ GstVideoReceiver::stopDecoding(void)
return; return;
} }
qCDebug(VideoReceiverLog) << "Stopping decoding"; qCDebug(VideoReceiverLog) << "Stopping decoding" << _uri;
// exit immediately if we are not decoding // exit immediately if we are not decoding
if (_pipeline == nullptr || !_decoding) { if (_pipeline == nullptr || !_decoding) {
qCDebug(VideoReceiverLog) << "Not decoding!"; qCDebug(VideoReceiverLog) << "Not decoding!" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStopDecodingComplete(STATUS_INVALID_STATE); emit onStopDecodingComplete(STATUS_INVALID_STATE);
}); });
@ -490,10 +497,10 @@ GstVideoReceiver::startRecording(const QString& videoFile, FILE_FORMAT format)
return; return;
} }
qCDebug(VideoReceiverLog) << "Starting recording"; qCDebug(VideoReceiverLog) << "Starting recording" << _uri;
if (_pipeline == nullptr) { if (_pipeline == nullptr) {
qCDebug(VideoReceiverLog) << "Streaming is not active!"; qCDebug(VideoReceiverLog) << "Streaming is not active!" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartRecordingComplete(STATUS_INVALID_STATE); emit onStartRecordingComplete(STATUS_INVALID_STATE);
}); });
@ -501,17 +508,17 @@ GstVideoReceiver::startRecording(const QString& videoFile, FILE_FORMAT format)
} }
if (_recording) { if (_recording) {
qCDebug(VideoReceiverLog) << "Already recording!"; qCDebug(VideoReceiverLog) << "Already recording!" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartRecordingComplete(STATUS_INVALID_STATE); emit onStartRecordingComplete(STATUS_INVALID_STATE);
}); });
return; return;
} }
qCDebug(VideoReceiverLog) << "New video file:" << videoFile; qCDebug(VideoReceiverLog) << "New video file:" << videoFile << "" << _uri;
if ((_fileSink = _makeFileSink(videoFile, format)) == nullptr) { if ((_fileSink = _makeFileSink(videoFile, format)) == nullptr) {
qCCritical(VideoReceiverLog) << "_makeFileSink() failed"; qCCritical(VideoReceiverLog) << "_makeFileSink() failed" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartRecordingComplete(STATUS_FAIL); emit onStartRecordingComplete(STATUS_FAIL);
}); });
@ -525,7 +532,7 @@ GstVideoReceiver::startRecording(const QString& videoFile, FILE_FORMAT format)
gst_bin_add(GST_BIN(_pipeline), _fileSink); gst_bin_add(GST_BIN(_pipeline), _fileSink);
if (!gst_element_link(_recorderValve, _fileSink)) { if (!gst_element_link(_recorderValve, _fileSink)) {
qCCritical(VideoReceiverLog) << "Failed to link valve and file sink"; qCCritical(VideoReceiverLog) << "Failed to link valve and file sink" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartRecordingComplete(STATUS_FAIL); emit onStartRecordingComplete(STATUS_FAIL);
}); });
@ -542,7 +549,7 @@ GstVideoReceiver::startRecording(const QString& videoFile, FILE_FORMAT format)
GstPad* probepad; GstPad* probepad;
if ((probepad = gst_element_get_static_pad(_recorderValve, "src")) == nullptr) { if ((probepad = gst_element_get_static_pad(_recorderValve, "src")) == nullptr) {
qCCritical(VideoReceiverLog) << "gst_element_get_static_pad() failed"; qCCritical(VideoReceiverLog) << "gst_element_get_static_pad() failed" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartRecordingComplete(STATUS_FAIL); emit onStartRecordingComplete(STATUS_FAIL);
}); });
@ -556,7 +563,7 @@ GstVideoReceiver::startRecording(const QString& videoFile, FILE_FORMAT format)
g_object_set(_recorderValve, "drop", FALSE, nullptr); g_object_set(_recorderValve, "drop", FALSE, nullptr);
_recording = true; _recording = true;
qCDebug(VideoReceiverLog) << "Recording started"; qCDebug(VideoReceiverLog) << "Recording started" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStartRecordingComplete(STATUS_OK); emit onStartRecordingComplete(STATUS_OK);
emit recordingChanged(_recording); emit recordingChanged(_recording);
@ -574,11 +581,11 @@ GstVideoReceiver::stopRecording(void)
return; return;
} }
qCDebug(VideoReceiverLog) << "Stopping recording"; qCDebug(VideoReceiverLog) << "Stopping recording" << _uri;
// exit immediately if we are not recording // exit immediately if we are not recording
if (_pipeline == nullptr || !_recording) { if (_pipeline == nullptr || !_recording) {
qCDebug(VideoReceiverLog) << "Not recording!"; qCDebug(VideoReceiverLog) << "Not recording!" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit onStopRecordingComplete(STATUS_INVALID_STATE); emit onStopRecordingComplete(STATUS_INVALID_STATE);
}); });
@ -636,7 +643,7 @@ GstVideoReceiver::_watchdog(void)
} }
if (now - _lastSourceFrameTime > _timeout) { if (now - _lastSourceFrameTime > _timeout) {
qCDebug(VideoReceiverLog) << "Stream timeout, no frames for " << now - _lastSourceFrameTime; qCDebug(VideoReceiverLog) << "Stream timeout, no frames for " << now - _lastSourceFrameTime << "" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit timeout(); emit timeout();
}); });
@ -648,7 +655,7 @@ GstVideoReceiver::_watchdog(void)
} }
if (now - _lastVideoFrameTime > _timeout * 2) { if (now - _lastVideoFrameTime > _timeout * 2) {
qCDebug(VideoReceiverLog) << "Video decoder timeout, no frames for " << now - _lastVideoFrameTime; qCDebug(VideoReceiverLog) << "Video decoder timeout, no frames for " << now - _lastVideoFrameTime << " " << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit timeout(); emit timeout();
}); });
@ -662,6 +669,7 @@ GstVideoReceiver::_handleEOS(void)
{ {
if(_pipeline == nullptr) { if(_pipeline == nullptr) {
qCWarning(VideoReceiverLog) << "We should not be here"; qCWarning(VideoReceiverLog) << "We should not be here";
stop();
return; return;
} }
@ -958,7 +966,7 @@ GstVideoReceiver::_onNewSourcePad(GstPad* pad)
if (!_streaming) { if (!_streaming) {
_streaming = true; _streaming = true;
qCDebug(VideoReceiverLog) << "Streaming started"; qCDebug(VideoReceiverLog) << "Streaming started" << _uri;
_dispatchSignal([this](){ _dispatchSignal([this](){
emit streamingChanged(_streaming); emit streamingChanged(_streaming);
}); });
@ -979,7 +987,7 @@ GstVideoReceiver::_onNewSourcePad(GstPad* pad)
g_object_set(_decoderValve, "drop", FALSE, nullptr); g_object_set(_decoderValve, "drop", FALSE, nullptr);
qCDebug(VideoReceiverLog) << "Decoding started"; qCDebug(VideoReceiverLog) << "Decoding started" << _uri;
} }
void void
@ -987,6 +995,8 @@ GstVideoReceiver::_onNewDecoderPad(GstPad* pad)
{ {
GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(_pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "pipeline-with-new-decoder-pad"); GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(_pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "pipeline-with-new-decoder-pad");
qCDebug(VideoReceiverLog) << "_onNewDecoderPad" << _uri;
if (!_addVideoSink(pad)) { if (!_addVideoSink(pad)) {
qCCritical(VideoReceiverLog) << "_addVideoSink() failed"; qCCritical(VideoReceiverLog) << "_addVideoSink() failed";
} }
@ -1300,7 +1310,7 @@ GstVideoReceiver::_onBusMessage(GstBus* bus, GstMessage* msg, gpointer data)
} }
pThis->_slotHandler.dispatch([pThis](){ pThis->_slotHandler.dispatch([pThis](){
qCDebug(VideoReceiverLog) << "Stoppping because of error"; qCDebug(VideoReceiverLog) << "Stopping because of error";
pThis->stop(); pThis->stop();
}); });
} while(0); } while(0);

1
src/VideoReceiver/GstVideoReceiver.h
Unescape View File

@ -158,6 +158,7 @@ protected:
//-- RTSP UDP reconnect timeout //-- RTSP UDP reconnect timeout
uint64_t _udpReconnect_us; uint64_t _udpReconnect_us;
QString _uri;
unsigned _timeout; unsigned _timeout;
Worker _slotHandler; Worker _slotHandler;

Write Preview
Loading…
Cancel
Save