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

Libug: enable strips

Browse Source
This commit is contained in:
Martin Pulec
2021-01-27 14:20:22 +01:00
parent 5f6ba155cb
commit 8514de2fc4
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/libug.cpp
View File

@@ -10,6 +10,7 @@
#include "libug.h"
#include "capture_filter.h"
#include "debug.h"
#include "host.h"
#include "src/host.h"
@@ -44,6 +45,7 @@ struct ug_sender {
struct wait_obj *wait_obj = wait_obj_init();
struct module root_module;
struct init_data *common;
struct capture_filter *stripe = nullptr;
ug_sender() {
common = common_preinit(argc, argv, nullptr);
@@ -117,6 +119,12 @@ struct ug_sender *ug_sender_init(const struct ug_sender_parameters *init_params)
return nullptr;
}
if (init_params->disable_strips == 0) {
if (capture_filter_init(nullptr, "stripe", &s->stripe) != 0) {
abort();
}
}
render_packet_received_callback = init_params->rprc;
render_packet_received_callback_udata = init_params->rprc_udata;
@@ -136,13 +144,19 @@ void ug_send_frame(struct ug_sender *s, const char *data, libug_pixfmt_t codec,
f->tiles[0].data = const_cast<char *>(data);
f->tiles[0].data_len = vc_get_datalen(width, height, f->color_spec);
wait_obj_reset(s->wait_obj);
auto frame = shared_ptr<video_frame>(f, [&](struct video_frame *) {
wait_obj_notify(s->wait_obj);
});
s->video_rxtx->send(move(frame));
if (s->stripe) {
struct video_frame *strips = capture_filter(s->stripe, f);
auto frame = shared_ptr<video_frame>(strips, strips->callbacks.dispose);
s->video_rxtx->send(move(frame));
} else {
wait_obj_reset(s->wait_obj);
auto frame = shared_ptr<video_frame>(f, [&](struct video_frame *) {
wait_obj_notify(s->wait_obj);
});
s->video_rxtx->send(move(frame));
wait_obj_wait(s->wait_obj);
wait_obj_wait(s->wait_obj);
}
vf_free(f);
}
@@ -151,6 +165,9 @@ void ug_sender_done(struct ug_sender *s)
{
render_packet_received_callback = nullptr;
render_packet_received_callback_udata = nullptr;
if (s->stripe) {
capture_filter_destroy(s->stripe);
}
delete s;
}
@@ -226,6 +243,10 @@ struct ug_receiver *ug_receiver_start(struct ug_receiver_parameters *init_params
}
}
if (init_params->disable_strips == 0) {
commandline_params["gpujpeg-unstripe"] = string();
}
if (init_params->decompress_to != 0) {
commandline_params["decoder-use-codec"] = get_codec_name((codec_t) init_params->decompress_to);
}

2
src/libug.h
View File

@@ -51,6 +51,7 @@ struct ug_sender_parameters {
int tx_port; ///< TX port (optional, default 5004)
int rx_port; ///< RX port (optional, default 5004)
int verbose; ///< verbosity level (optional, default 0, 1 - verbose, 2 - debug)
int disable_strips; ///< do not enable 8x1 strips (to improve compression), default 0 (enable)
};
/**
@@ -77,6 +78,7 @@ struct ug_receiver_parameters {
libug_pixfmt_t decompress_to; ///< optional - pixel format to decompress to
bool force_gpu_decoding; ///< force GPU decoding (decode with GPUJPEG)
int verbose; ///< verbosity level (optional, default 0, 1 - verbose, 2 - debug)
int disable_strips; ///< do not enable 8x1 strips (to improve compression), default 0 (enable)
};
LIBUG_DLL struct ug_receiver *ug_receiver_start(struct ug_receiver_parameters *init_params);
LIBUG_DLL void ug_receiver_done(struct ug_receiver *state);