Browse Source

Camera: video stream request fixup

This fixes getting the video stream.
QGC4.4
Julian Oes 9 months ago
parent
commit
6eb0e42539
No known key found for this signature in database
GPG Key ID: F0ED380FEA56DE41
  1. 13
      src/Camera/QGCCameraControl.cc

13
src/Camera/QGCCameraControl.cc

@ -1796,7 +1796,7 @@ QGCCameraControl::_requestStreamInfo(uint8_t streamID)
qCDebug(CameraControlLog) << "Requesting video stream info for:" << streamID; qCDebug(CameraControlLog) << "Requesting video stream info for:" << streamID;
// By default, try to use new REQUEST_MESSAGE command instead of // By default, try to use new REQUEST_MESSAGE command instead of
// deprecated MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION. // deprecated MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION.
if (_videoStreamStatusRetries % 2 == 0) { if (_videoStreamStatusRetries++ % 2 == 0) {
_vehicle->sendMavCommand( _vehicle->sendMavCommand(
_compID, // target component _compID, // target component
MAV_CMD_REQUEST_MESSAGE, // command id MAV_CMD_REQUEST_MESSAGE, // command id
@ -1827,11 +1827,11 @@ QGCCameraControl::_requestStreamStatus(uint8_t streamID)
MAVLINK_MSG_ID_VIDEO_STREAM_STATUS, // msgid MAVLINK_MSG_ID_VIDEO_STREAM_STATUS, // msgid
streamID); // stream id streamID); // stream id
} else { } else {
_vehicle->sendMavCommand( _vehicle->sendMavCommand(
_compID, // Target component _compID, // Target component
MAV_CMD_REQUEST_VIDEO_STREAM_STATUS, // Command id MAV_CMD_REQUEST_VIDEO_STREAM_STATUS, // Command id
false, // ShowError false, // ShowError
streamID); // Stream ID streamID); // Stream ID
} }
_streamStatusTimer.start(1000); // Wait up to a second for it _streamStatusTimer.start(1000); // Wait up to a second for it
} }
@ -1904,7 +1904,6 @@ QGCCameraControl::_streamInfoTimeout()
void void
QGCCameraControl::_streamStatusTimeout() QGCCameraControl::_streamStatusTimeout()
{ {
_videoStreamStatusRetries++;
QGCVideoStreamInfo* pStream = currentStreamInstance(); QGCVideoStreamInfo* pStream = currentStreamInstance();
if(pStream) { if(pStream) {
_requestStreamStatus(static_cast<uint8_t>(pStream->streamID())); _requestStreamStatus(static_cast<uint8_t>(pStream->streamID()));

Loading…
Cancel
Save