feat(rtsp-server): Added frame auto-drop feature to solve the problem…

… of delay accumulation.(#102) Signed-off-by: scottxu <[email protected]>
iamscottxu · Mar 20, 2023 · 764b2af · 764b2af
1 parent 50a191b
commit 764b2af
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/rtsp_output.cpp b/rtsp_output.cpp
@@ -21,6 +21,7 @@
 #define ERROR_START_MULTICAST 4
 #define ERROR_ENCODE OBS_OUTPUT_ENCODE_ERROR
 
+#define OBS_RTSPSERVER_QUEUE_SIZE_LIMIT 2
 
 struct queue_frame {
 	queue_frame(size_t size = 0)
@@ -359,8 +360,8 @@ static void rtsp_output_rtsp_start(void *data)
 		}
 	}
 
-	out_data->frame_queue =
-		std::make_unique<threadsafe_queue<queue_frame>>();
+	out_data->frame_queue = std::make_unique<threadsafe_queue<queue_frame>>(
+		OBS_RTSPSERVER_QUEUE_SIZE_LIMIT);
 
 	session->AddNotifyConnectedCallback(
 		[](const xop::MediaSessionId session_id,
@@ -643,6 +644,18 @@ static uint64_t rtsp_output_total_bytes_sent(void *data)
 	return out_data->total_bytes_sent;
 }
 
+static int rtsp_output_get_dropped_frames(void *data)
+{
+	const auto *out_data = static_cast<rtsp_out_data *>(data);
+	if (!active(out_data) || out_data->frame_queue == nullptr) {
+		return 0;
+	}
+	auto dropped_count = out_data->frame_queue->dropped_count();
+	while (dropped_count > INT32_MAX)
+		dropped_count -= INT32_MAX;
+	return static_cast<int>(dropped_count);
+}
+
 void rtsp_output_register()
 {
 	struct obs_output_info output_info = {};
@@ -661,6 +674,7 @@ void rtsp_output_register()
 	output_info.update = rtsp_output_update;
 	output_info.get_properties = rtsp_output_properties;
 	output_info.get_total_bytes = rtsp_output_total_bytes_sent;
+	output_info.get_dropped_frames = rtsp_output_get_dropped_frames;
 
 	obs_register_output(&output_info);
 }
diff --git a/rtsp_output_helper.cpp b/rtsp_output_helper.cpp
@@ -98,6 +98,16 @@ uint64_t RtspOutputHelper::GetTotalBytes() const
 	return obs_output_get_total_bytes(obsOutput);
 }
 
+int RtspOutputHelper::GetTotalFrames() const
+{
+	return obs_output_get_total_frames(obsOutput);
+}
+
+int RtspOutputHelper::GetFramesDropped() const
+{
+	return obs_output_get_frames_dropped(obsOutput);
+}
+
 bool RtspOutputHelper::IsActive() const
 {
 	return obs_output_active(obsOutput);

diff --git a/rtsp_output_helper.h b/rtsp_output_helper.h
@@ -29,6 +29,8 @@ class RtspOutputHelper {
 			      void *data) const;
 	std::string GetOutputName() const;
 	uint64_t GetTotalBytes() const;
+	int GetTotalFrames() const;
+	int GetFramesDropped() const;
 	bool IsActive() const;
 
 private:

diff --git a/threadsafe_queue.h b/threadsafe_queue.h
@@ -94,6 +94,10 @@ template<typename T> class threadsafe_queue
 		shared_ptr<T> data(make_shared<T>(std::move(new_value)));
 		unique_lock<mutex> lk(mut);
 		data_queue.push(data);
+		if (data_queue.size() > size_limit) {
+			data_queue.pop();
+			m_dropped_count.fetch_add(1, memory_order_relaxed);
+		}
 		data_cond.notify_one();
 	}
 
@@ -139,6 +143,7 @@ template<typename T> class threadsafe_queue
 private:
 	mutex mut;
 	queue<shared_ptr<T>> data_queue;
+	const size_t size_limit;
 	condition_variable data_cond;
 	atomic_bool m_termination;
 	atomic_size_t m_dropped_count;

diff --git a/ui/rtsp_properties.ui b/ui/rtsp_properties.ui
@@ -60,7 +60,7 @@
       </item>
       <item row="3" column="1">
        <widget class="QWidget" name="widgetEnabledAudioTracks" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout">
+        <layout class="QHBoxLayout" name="widgetEnabledAudioTracks_layout">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -439,7 +439,7 @@
      <layout class="QVBoxLayout" name="status_layout">
       <item>
        <widget class="QWidget" name="widgetStatus" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <layout class="QGridLayout" name="widgetStatus_layout">
          <property name="leftMargin">
           <number>0</number>
          </property>