From bbbc242828ccc6ea86c8a9504b4bcc0338068357 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 19 May 2016 10:33:09 +0200 Subject: [PATCH] Control socket: report events per port (reflector) --- src/video_rxtx/ultragrid_rtp.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/video_rxtx/ultragrid_rtp.cpp b/src/video_rxtx/ultragrid_rtp.cpp index 57be01c33..d071e22be 100644 --- a/src/video_rxtx/ultragrid_rtp.cpp +++ b/src/video_rxtx/ultragrid_rtp.cpp @@ -155,13 +155,6 @@ void ultragrid_rtp_video_rxtx::send_frame_async(shared_ptr tx_frame int buffer_id = tx_get_buffer_id(m_tx); - auto new_desc = video_desc_from_frame(tx_frame.get()); - if (new_desc != m_video_desc) { - control_report_event(m_control, string("captured video changed - ") + - (string) new_desc); - m_video_desc = new_desc; - } - if (m_paused) { goto after_send; } @@ -217,6 +210,13 @@ after_send: if (m_port_id != -1) { oss << "-" << m_port_id << " "; } + auto new_desc = video_desc_from_frame(tx_frame.get()); + if (new_desc != m_video_desc) { + control_report_event(m_control, string("-") + to_string(m_port_id) + + string(" captured video changed - ") + + (string) new_desc); + m_video_desc = new_desc; + } oss << "bufferId " << buffer_id << " droppedFrames " << dropped_frames << " nanoPerFrameActual " << (m_nano_per_frame_actual_cumul += nano_actual) <<