diff --git a/CMakeLists.txt b/CMakeLists.txt index a2e6dcf..c5b92e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ message ("Here") set (${PROJECT_NAME}_VERSION_MAJOR 1) set (${PROJECT_NAME}_VERSION_MINOR 0) -set (${PROJECT_NAME}_VERSION_PATCH 2) +set (${PROJECT_NAME}_VERSION_PATCH 3) set (${PROJECT_NAME}_SUFFIX "-beta") set (${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}${${PROJECT_NAME}_SUFFIX}") diff --git a/README.md b/README.md index 9e166b6..17c9d2a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## An RTSP surveillance camera access multitool [![cameradar License](https://img.shields.io/badge/license-Apache-blue.svg)](#license) -[![Latest release](https://img.shields.io/badge/release-1.0.2-green.svg)](https://github.com/EtixLabs/cameradar/releases/latest) +[![Latest release](https://img.shields.io/badge/release-1.0.3-green.svg)](https://github.com/EtixLabs/cameradar/releases/latest) #### Cameradar allows you to: diff --git a/cameradar_standalone/src/tasks/stream_check.cpp b/cameradar_standalone/src/tasks/stream_check.cpp index 770df51..d1427ba 100644 --- a/cameradar_standalone/src/tasks/stream_check.cpp +++ b/cameradar_standalone/src/tasks/stream_check.cpp @@ -39,12 +39,15 @@ stream_check::run() const { pipeline = gst_parse_launch("rtspsrc name=source ! rtph264depay ! h264parse ! fakesink", &error); + std::string location = "rtsp://"; + location += stream.username + ":" + stream.password + "@" + stream.address + ":" + std::to_string(stream.port); if (pipeline == NULL) { LOG_ERR_("[" + stream.address + "] Can't configure pipeline", "stream_check"); return false; } else { elem = gst_bin_get_by_name(GST_BIN(pipeline), "source"); - g_object_set(G_OBJECT(elem), "location", stream.address, "latency", 20, NULL); + LOG_DEBUG_("Launching gstreamer check on rtsp://" + stream.username + ":" + stream.password + "@" + stream.address + ":" + std::to_string(stream.port), "gstreamer check"); + g_object_set(G_OBJECT(elem), "location", location.c_str(), "latency", 20, NULL); if (gst_element_set_state(pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) { LOG_ERR_(