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

Hd-rum-transcode: do not blend by default

Browse Source
This commit is contained in:
Martin Pulec
2015-08-27 17:32:47 +02:00
parent 0e075bbb43
commit fa5dffe91f
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/hd-rum-translator/hd-rum-decompress.cpp
View File

@@ -170,7 +170,7 @@ void state_transcoder_decompress::worker()
}
}
void *hd_rum_decompress_init(struct module *parent)
void *hd_rum_decompress_init(struct module *parent, bool blend)
{
struct state_transcoder_decompress *s;
bool use_ipv6 = false;
@@ -178,9 +178,15 @@ void *hd_rum_decompress_init(struct module *parent)
s = new state_transcoder_decompress();
chrono::steady_clock::time_point start_time(chrono::steady_clock::now());
char cfg[128] = "";
snprintf(cfg, sizeof cfg, "pipe:%p", s);
assert (initialize_video_display(parent, "proxy", cfg, 0, &s->display) == 0);
if (blend) {
char cfg[128] = "";
snprintf(cfg, sizeof cfg, "pipe:%p", s);
assert (initialize_video_display(parent, "proxy", cfg, 0, &s->display) == 0);
} else {
char cfg[2 + sizeof(void *) * 2 + 1] = "";
snprintf(cfg, sizeof cfg, "%p", s);
assert (initialize_video_display(parent, "pipe", cfg, 0, &s->display) == 0);
}
map<string, param_u> params;

2
src/hd-rum-translator/hd-rum-decompress.h
View File

@@ -5,7 +5,7 @@ extern "C" {
struct module;
ssize_t hd_rum_decompress_write(void *state, void *buf, size_t count);
void *hd_rum_decompress_init(struct module *parent);
void *hd_rum_decompress_init(struct module *parent, bool blend);
void hd_rum_decompress_done(void *state);
void hd_rum_decompress_set_active(void *decompress_state, void *recompress_state, bool active);
void hd_rum_decompress_remove_port(void *decompress_state, int index);

12
src/hd-rum-translator/hd-rum-translator.cpp
View File

@@ -292,6 +292,7 @@ static void usage(const char *progname) {
progname);
printf("\twhere global_opts may be:\n"
"\t\t--control-port <port_number>[:0|:1] - control port to connect to, optionally client/server (default)\n"
"\t\t--blend - enable blending from original to newly received stream, increases latency\n"
"\t\t--help\n");
printf("\tand hostX_options may be:\n"
"\t\t-P <port> - TX port to be used\n"
@@ -313,9 +314,10 @@ struct host_opts {
};
static bool parse_fmt(int argc, char **argv, char **bufsize, unsigned short *port,
struct host_opts **host_opts, int *host_opts_count, int *control_port, int *control_connection_type)
struct host_opts **host_opts, int *host_opts_count, int *control_port, int *control_connection_type, bool *blend)
{
int start_index = 1;
*blend = false;
while(start_index < argc && argv[start_index][0] == '-') {
if(strcmp(argv[start_index], "--control-port") == 0) {
@@ -328,6 +330,9 @@ static bool parse_fmt(int argc, char **argv, char **bufsize, unsigned short *por
} else if(strcmp(argv[start_index], "--capabilities") == 0) {
print_capabilities(CAPABILITY_COMPRESS, NULL, false);
return false;
} else if(strcmp(argv[start_index], "--blend") == 0) {
*blend = true;
return false;
} else if(strcmp(argv[start_index], "--help") == 0) {
usage(argv[0]);
return false;
@@ -432,6 +437,7 @@ int main(int argc, char **argv)
int host_count;
int control_port = CONTROL_DEFAULT_PORT;
int control_connection_type = 0;
bool blend;
#ifdef WIN32
WSADATA wsaData;
@@ -476,7 +482,7 @@ int main(int argc, char **argv)
#endif
bool ret = parse_fmt(argc, argv, &bufsize_str, &port, &hosts, &host_count, &control_port,
&control_connection_type);
&control_connection_type, &blend);
if (ret == false) {
return EXIT_SUCCESS;
@@ -533,7 +539,7 @@ int main(int argc, char **argv)
control_start(state.control_state);
// we need only one shared receiver decompressor for all recompressing streams
state.decompress = hd_rum_decompress_init(&state.mod);;
state.decompress = hd_rum_decompress_init(&state.mod, blend);
if(!state.decompress) {
return EXIT_FAIL_DECODER;
}