forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-05-26 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed sink

Browse Source
This commit is contained in:
Devaev Maxim
2021-01-10 13:00:50 +03:00
parent 649cda2f47
commit 083ec30c66
6 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
man/ustreamer-dump.1
View File

@@ -13,7 +13,7 @@ ustreamer-dump \- Dump uStreamer's memory sink to file
µStreamer-dump (\fBustreamer-dump\fP) writes a local stream from ustreamer to a file or redirect it to other utilities (such as \fBffmpeg\fR). µStreamer-dump (\fBustreamer-dump\fP) writes a local stream from ustreamer to a file or redirect it to other utilities (such as \fBffmpeg\fR).
.SH USAGE .SH USAGE
\fBustreamer\fR requires at least the \fB\-\-???\-sink\fR option to operate. \fBustreamer\fR requires at least the \fB\-\-sink\fR option to operate.
To output ustreamers sink "test" to ffmpeg, and into a file called test.mp4: To output ustreamers sink "test" to ffmpeg, and into a file called test.mp4:

8
man/ustreamer.1
View File

@@ -201,16 +201,16 @@ Timeout for client connections. Default: 10.
.SS "JPEG sink options" .SS "JPEG sink options"
With shared memory sink you can write a stream to a file. See \fBustreamer-dump\fR(1) for more info. With shared memory sink you can write a stream to a file. See \fBustreamer-dump\fR(1) for more info.
.TP .TP
.BR \-\-jpeg\-sink\ \fIname .BR \-\-sink\ \fIname
Use the specified shared memory object to sink JPEG frames. Default: disabled. Use the specified shared memory object to sink JPEG frames. Default: disabled.
.TP .TP
.BR \-\-jpeg\-sink\-mode\ \fImode .BR \-\-sink\-mode\ \fImode
Set JPEG sink permissions (like 777). Default: 660. Set JPEG sink permissions (like 777). Default: 660.
.TP .TP
.BR \-\-jpeg\-sink\-rm .BR \-\-sink\-rm
Remove shared memory on stop. Default: disabled. Remove shared memory on stop. Default: disabled.
.TP .TP
.BR \-\-jpeg\-sink\-timeout\ \fIsec .BR \-\-sink\-timeout\ \fIsec
Timeout for lock. Default: 1. Timeout for lock. Default: 1.
.SS "H264 sink options" .SS "H264 sink options"

104
src/ustreamer/options.c
View File

@@ -82,14 +82,14 @@ enum _OPT_VALUES {
_O_TCP_NODELAY, _O_TCP_NODELAY,
_O_SERVER_TIMEOUT, _O_SERVER_TIMEOUT,
# define ADD_SINK(_upper) \ # define ADD_SINK(_prefix) \
_O_##_upper##_SINK, \ _O_##_prefix##SINK, \
_O_##_upper##_SINK_MODE, \ _O_##_prefix##SINK_MODE, \
_O_##_upper##_SINK_RM, \ _O_##_prefix##SINK_RM, \
_O_##_upper##_SINK_TIMEOUT, _O_##_prefix##SINK_TIMEOUT,
ADD_SINK(JPEG) ADD_SINK(_)
# ifdef WITH_OMX # ifdef WITH_OMX
ADD_SINK(H264) ADD_SINK(H264_)
_O_H264_BITRATE, _O_H264_BITRATE,
_O_H264_GOP, _O_H264_GOP,
# endif # endif
@@ -173,14 +173,14 @@ static const struct option _LONG_OPTS[] = {
{"tcp-nodelay", no_argument, NULL, _O_TCP_NODELAY}, {"tcp-nodelay", no_argument, NULL, _O_TCP_NODELAY},
{"server-timeout", required_argument, NULL, _O_SERVER_TIMEOUT}, {"server-timeout", required_argument, NULL, _O_SERVER_TIMEOUT},
# define ADD_SINK(_lower, _upper) \ # define ADD_SINK(_opt, _prefix) \
{#_lower "-sink", required_argument, NULL, _O_##_upper##_SINK}, \ {_opt "sink", required_argument, NULL, _O_##_prefix##SINK}, \
{#_lower "-sink-mode", required_argument, NULL, _O_##_upper##_SINK_MODE}, \ {_opt "sink-mode", required_argument, NULL, _O_##_prefix##SINK_MODE}, \
{#_lower "-sink-rm", no_argument, NULL, _O_##_upper##_SINK_RM}, \ {_opt "sink-rm", no_argument, NULL, _O_##_prefix##SINK_RM}, \
{#_lower "-sink-timeout", required_argument, NULL, _O_##_upper##_SINK_TIMEOUT}, {_opt "sink-timeout", required_argument, NULL, _O_##_prefix##SINK_TIMEOUT},
ADD_SINK(jpeg, JPEG) ADD_SINK("", _)
# ifdef WITH_OMX # ifdef WITH_OMX
ADD_SINK(h264, H264) ADD_SINK("h264-", H264_)
{"h264-bitrate", required_argument, NULL, _O_H264_BITRATE}, {"h264-bitrate", required_argument, NULL, _O_H264_BITRATE},
{"h264-gop", required_argument, NULL, _O_H264_GOP}, {"h264-gop", required_argument, NULL, _O_H264_GOP},
# endif # endif
@@ -237,14 +237,14 @@ options_s *options_init(unsigned argc, char *argv[]) {
} }
void options_destroy(options_s *options) { void options_destroy(options_s *options) {
# define ADD_SINK(_lower) { \ # define ADD_SINK(_prefix) { \
if (options->_lower##_sink) { \ if (options->_prefix##sink) { \
memsink_destroy(options->_lower##_sink); \ memsink_destroy(options->_prefix##sink); \
} \ } \
} }
ADD_SINK(jpeg); ADD_SINK();
# ifdef WITH_OMX # ifdef WITH_OMX
ADD_SINK(h264); ADD_SINK(h264_);
# endif # endif
# undef ADD_SINK # undef ADD_SINK
@@ -330,14 +330,14 @@ int options_parse(options_s *options, device_s *dev, encoder_s *enc, stream_s *s
char *blank_path = NULL; char *blank_path = NULL;
# define ADD_SINK(_lower) \ # define ADD_SINK(_prefix) \
char *_lower##_sink_name = NULL; \ char *_prefix##sink_name = NULL; \
mode_t _lower##_sink_mode = 0660; \ mode_t _prefix##sink_mode = 0660; \
bool _lower##_sink_rm = false; \ bool _prefix##sink_rm = false; \
unsigned _lower##_sink_timeout = 1; unsigned _prefix##sink_timeout = 1;
ADD_SINK(jpeg); ADD_SINK();
# ifdef WITH_OMX # ifdef WITH_OMX
ADD_SINK(h264); ADD_SINK(h264_);
# endif # endif
# undef ADD_SINK # undef ADD_SINK
@@ -427,14 +427,14 @@ int options_parse(options_s *options, device_s *dev, encoder_s *enc, stream_s *s
case _O_TCP_NODELAY: OPT_SET(server->tcp_nodelay, true); case _O_TCP_NODELAY: OPT_SET(server->tcp_nodelay, true);
case _O_SERVER_TIMEOUT: OPT_NUMBER("--server-timeout", server->timeout, 1, 60, 0); case _O_SERVER_TIMEOUT: OPT_NUMBER("--server-timeout", server->timeout, 1, 60, 0);
# define ADD_SINK(_lower, _upper) \ # define ADD_SINK(_opt, _lp, _up) \
case _O_##_upper##_SINK: OPT_SET(_lower##_sink_name, optarg); \ case _O_##_up##SINK: OPT_SET(_lp##sink_name, optarg); \
case _O_##_upper##_SINK_MODE: OPT_NUMBER("--" #_lower "-sink-mode", _lower##_sink_mode, INT_MIN, INT_MAX, 8); \ case _O_##_up##SINK_MODE: OPT_NUMBER("--" #_opt "sink-mode", _lp##sink_mode, INT_MIN, INT_MAX, 8); \
case _O_##_upper##_SINK_RM: OPT_SET(_lower##_sink_rm, true); \ case _O_##_up##SINK_RM: OPT_SET(_lp##sink_rm, true); \
case _O_##_upper##_SINK_TIMEOUT: OPT_NUMBER("--" #_lower "-sink-timeout", _lower##_sink_timeout, 1, 60, 0); case _O_##_up##SINK_TIMEOUT: OPT_NUMBER("--" #_opt "sink-timeout", _lp##sink_timeout, 1, 60, 0);
ADD_SINK(jpeg, JPEG) ADD_SINK("", , _)
# ifdef WITH_OMX # ifdef WITH_OMX
ADD_SINK(h264, H264) ADD_SINK("h264-", h264_, H264_)
case _O_H264_BITRATE: OPT_NUMBER("--h264-bitrate", stream->h264_bitrate, 100, 16000, 0); case _O_H264_BITRATE: OPT_NUMBER("--h264-bitrate", stream->h264_bitrate, 100, 16000, 0);
case _O_H264_GOP: OPT_NUMBER("--h264-gop", stream->h264_gop, 0, 60, 0); case _O_H264_GOP: OPT_NUMBER("--h264-gop", stream->h264_gop, 0, 60, 0);
# endif # endif
@@ -479,22 +479,22 @@ int options_parse(options_s *options, device_s *dev, encoder_s *enc, stream_s *s
options->blank = blank_frame_init(blank_path); options->blank = blank_frame_init(blank_path);
stream->blank = options->blank; stream->blank = options->blank;
# define ADD_SINK(_lower, _upper) { \ # define ADD_SINK(_name, _prefix) { \
if (_lower##_sink_name && _lower##_sink_name[0] != '\0') { \ if (_prefix##sink_name && _prefix##sink_name[0] != '\0') { \
options->_lower##_sink = memsink_init( \ options->_prefix##sink = memsink_init( \
#_upper, \ _name, \
_lower##_sink_name, \ _prefix##sink_name, \
true, \ true, \
_lower##_sink_mode, \ _prefix##sink_mode, \
_lower##_sink_rm, \ _prefix##sink_rm, \
_lower##_sink_timeout \ _prefix##sink_timeout \
); \ ); \
} \ } \
stream->_lower##_sink = options->_lower##_sink; \ stream->_prefix##sink = options->_prefix##sink; \
} }
ADD_SINK(jpeg, JPEG); ADD_SINK("JPEG",);
# ifdef WITH_OMX # ifdef WITH_OMX
ADD_SINK(h264, H264); ADD_SINK("H264", h264_);
# endif # endif
# undef ADD_SINK # undef ADD_SINK
@@ -658,16 +658,16 @@ static void _help(FILE *fp, device_s *dev, encoder_s *enc, stream_s *stream, ser
SAY(" Default: disabled.\n"); SAY(" Default: disabled.\n");
SAY(" --allow-origin <str> ─────── Set Access-Control-Allow-Origin header. Default: disabled.\n"); SAY(" --allow-origin <str> ─────── Set Access-Control-Allow-Origin header. Default: disabled.\n");
SAY(" --server-timeout <sec> ───── Timeout for client connections. Default: %u.\n", server->timeout); SAY(" --server-timeout <sec> ───── Timeout for client connections. Default: %u.\n", server->timeout);
# define ADD_SINK(_lower, _upper) \ # define ADD_SINK(_name, _opt) \
SAY(#_upper " sink options:"); \ SAY(_name " sink options:"); \
SAY("══════════════════"); \ SAY("══════════════════"); \
SAY(" --" #_lower "-sink <name> ──────── Use the shared memory to sink " #_upper " frames. Default: disabled.\n"); \ SAY(" --" _opt "sink <name> ──────── Use the shared memory to sink " _name " frames. Default: disabled.\n"); \
SAY(" --" #_lower "-sink-mode <mode> ─── Set " #_upper " sink permissions (like 777). Default: 660.\n"); \ SAY(" --" _opt "sink-mode <mode> ─── Set " _name " sink permissions (like 777). Default: 660.\n"); \
SAY(" --" #_lower "-sink-rm ──────────── Remove shared memory on stop. Default: disabled.\n"); \ SAY(" --" _opt "sink-rm ──────────── Remove shared memory on stop. Default: disabled.\n"); \
SAY(" --" #_lower "-sink-timeout <sec> ─ Timeout for lock. Default: 1.\n"); SAY(" --" _opt "sink-timeout <sec> ─ Timeout for lock. Default: 1.\n");
ADD_SINK(jpeg, JPEG) ADD_SINK("JPEG", "")
# ifdef WITH_OMX # ifdef WITH_OMX
ADD_SINK(h264, H264) ADD_SINK("H264", "h264-")
SAY(" --h264-bitrate <kbps> ───── H264 bitrate in Kbps. Default: %u.\n", stream->h264_bitrate); SAY(" --h264-bitrate <kbps> ───── H264 bitrate in Kbps. Default: %u.\n", stream->h264_bitrate);
SAY(" --h264-gop <N> ──────────── Intarval between keyframes. Default: %u.\n", stream->h264_gop); SAY(" --h264-gop <N> ──────────── Intarval between keyframes. Default: %u.\n", stream->h264_gop);
# endif # endif

2
src/ustreamer/options.h
View File

@@ -54,7 +54,7 @@ typedef struct {
char **argv; char **argv;
char **argv_copy; char **argv_copy;
frame_s *blank; frame_s *blank;
memsink_s *jpeg_sink; memsink_s *sink;
# ifdef WITH_OMX # ifdef WITH_OMX
memsink_s *h264_sink; memsink_s *h264_sink;
# endif # endif

11
src/ustreamer/stream.c
View File

@@ -109,9 +109,6 @@ void stream_loop(stream_s *stream) {
if (!ready_wr->job_failed) { if (!ready_wr->job_failed) {
if (ready_wr->job_timely) { if (ready_wr->job_timely) {
_stream_expose_frame(stream, ready_job->dest, captured_fps); _stream_expose_frame(stream, ready_job->dest, captured_fps);
if (stream->jpeg_sink) {
memsink_server_put(stream->jpeg_sink, ready_job->dest);
}
LOG_PERF("##### Encoded frame exposed; worker=%s", ready_wr->name); LOG_PERF("##### Encoded frame exposed; worker=%s", ready_wr->name);
} else { } else {
LOG_PERF("----- Encoded frame dropped; worker=%s", ready_wr->name); LOG_PERF("----- Encoded frame dropped; worker=%s", ready_wr->name);
@@ -242,9 +239,6 @@ static workers_pool_s *_stream_init_loop(stream_s *stream) {
while (!atomic_load(&RUN(stop))) { while (!atomic_load(&RUN(stop))) {
if (_stream_expose_frame(stream, NULL, 0)) { if (_stream_expose_frame(stream, NULL, 0)) {
if (stream->jpeg_sink) {
memsink_server_put(stream->jpeg_sink, stream->blank);
}
# ifdef WITH_OMX # ifdef WITH_OMX
if (RUN(h264)) { if (RUN(h264)) {
_h264_stream_process(RUN(h264), stream->blank, -1); _h264_stream_process(RUN(h264), stream->blank, -1);
@@ -346,6 +340,11 @@ static bool _stream_expose_frame(stream_s *stream, frame_s *frame, unsigned capt
VID(captured_fps) = captured_fps; VID(captured_fps) = captured_fps;
atomic_store(&VID(updated), true); atomic_store(&VID(updated), true);
A_MUTEX_UNLOCK(&VID(mutex)); A_MUTEX_UNLOCK(&VID(mutex));
if (changed && stream->sink) {
memsink_server_put(stream->sink, VID(frame));
}
return changed; return changed;
# undef VID # undef VID

2
src/ustreamer/stream.h
View File

@@ -88,7 +88,7 @@ typedef struct {
frame_s *blank; frame_s *blank;
memsink_s *jpeg_sink; memsink_s *sink;
# ifdef WITH_OMX # ifdef WITH_OMX
memsink_s *h264_sink; memsink_s *h264_sink;