scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 15:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Control socket: per frame reports for producent

Browse Source
This commit is contained in:
Martin Pulec
2015-05-15 10:29:41 +02:00
parent 3a34edbe4c
commit f1094d119b
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/transmit.cpp
View File

@@ -1071,3 +1071,10 @@ void tx_send_h264(struct tx *tx, struct video_frame *frame,
frame->color_spec, frame->fps, frame->interlacing, 0,
0);
}
int tx_get_buffer_id(struct tx *tx)
{
return tx->buffer;
}

2
src/transmit.h
View File

@@ -81,6 +81,8 @@ struct tx *tx_init_h264(struct module *parent, unsigned mtu, enum tx_media_type
const char *fec, const char *encryption, long packet_rate);
void tx_send_h264(struct tx *tx_session, struct video_frame *frame, struct rtp *rtp_session);
int tx_get_buffer_id(struct tx *tx_session);
#ifdef __cplusplus
}
#endif

26
src/video_rxtx/ultragrid_rtp.cpp
View File

@@ -73,12 +73,13 @@
#include "utils/worker.h"
#include <chrono>
#include <sstream>
#include <utility>
using namespace std;
ultragrid_rtp_video_rxtx::ultragrid_rtp_video_rxtx(const map<string, param_u> &params) :
rtp_video_rxtx(params), m_stat_nanoperframeactual((struct module *) params.at("parent").ptr, "nanoperframeactual"), m_t0(std::chrono::steady_clock::now()), m_duration(std::chrono::nanoseconds::zero()), m_frames(0)
rtp_video_rxtx(params), m_stat_nanoperframeactual((struct module *) params.at("parent").ptr, "nanoperframeactual"), m_t0(std::chrono::steady_clock::now()), m_duration(std::chrono::nanoseconds::zero()), m_frames(0), m_send_bytes_total(0)
{
if ((params.at("postprocess").ptr != NULL &&
strstr((const char *) params.at("postprocess").ptr, "help") != NULL)) {
@@ -93,6 +94,14 @@ ultragrid_rtp_video_rxtx::ultragrid_rtp_video_rxtx(const map<string, param_u> &p
m_display_device = (struct display *) params.at("display_device").ptr;
m_requested_encryption = (const char *) params.at("encryption").ptr;
m_async_sending = false;
m_control = (struct control_state *) get_module(get_root_module(static_cast<struct module *>(params.at("parent").ptr)), "control");
uint32_t id;
if (get_port_id(get_root_module(static_cast<struct module *>(params.at("parent").ptr)), &id)) {
m_port_id = id;
} else {
m_port_id = -1;
}
}
ultragrid_rtp_video_rxtx::~ultragrid_rtp_video_rxtx()
@@ -183,6 +192,21 @@ void ultragrid_rtp_video_rxtx::send_frame_async(shared_ptr<video_frame> tx_frame
m_async_sending_cv.notify_all();
std::chrono::steady_clock::time_point t1 = std::chrono::steady_clock::now();
int buffer_id = tx_get_buffer_id(m_tx);
int dropped_frames = 0;
auto nanoseconds = std::chrono::duration_cast<std::chrono::nanoseconds>(t1 - t0).count();
int send_bytes = tx_frame->tiles[0].data_len;
m_send_bytes_total += send_bytes;
ostringstream oss;
oss << "bufferId " << buffer_id <<
" droppedFrames " << dropped_frames <<
" nanoperframeactual " << nanoseconds <<
" sendBytes " << send_bytes <<
" sendBytesTotal " << m_send_bytes_total;
control_report_stats(m_control, oss.str(), m_port_id);
m_frames += 1;
m_duration += std::chrono::duration_cast<std::chrono::nanoseconds>(t1 - t0);
auto seconds =

6
src/video_rxtx/ultragrid_rtp.h
View File

@@ -47,6 +47,8 @@
#include <mutex>
#include <string>
struct control_state;
class ultragrid_rtp_video_rxtx : public rtp_video_rxtx {
public:
ultragrid_rtp_video_rxtx(std::map<std::string, param_u> const &);
@@ -86,6 +88,10 @@ private:
std::chrono::steady_clock::time_point m_t0;
std::chrono::nanoseconds m_duration;
int m_frames;
long long int m_send_bytes_total;
struct control_state *m_control;
int32_t m_port_id;
};
video_rxtx *create_video_rxtx_ultragrid_rtp(std::map<std::string, param_u> const &params);