RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-09 00:29:54 +00:00
Code Issues Projects Releases Wiki Activity

avdevice/libndi_newtek_dec: add extra_ips option to libndi_newtek allowing use remote network sources

Browse Source 
Signed-off-by: Anton Platov <anton@platov.net>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Anton Platov 2018-10-29 15:57:31 +03:00 committed by Marton Balint
parent cb74c33106
commit 295fd12d17
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/indevs.texi
View File

@ -1078,6 +1078,10 @@ Defaults to @option{0.5}.
When this flag is @option{false}, all video that you receive will be progressive. When this flag is @option{false}, all video that you receive will be progressive.
Defaults to @option{true}. Defaults to @option{true}.
@item extra_ips
If is set to list of comma separated ip addresses, scan for sources not only
using mDNS but also use unicast ip addresses specified by this list.
@end table @end table
@subsection Examples @subsection Examples
@ -1090,12 +1094,25 @@ List input devices:
ffmpeg -f libndi_newtek -find_sources 1 -i dummy ffmpeg -f libndi_newtek -find_sources 1 -i dummy
@end example @end example
@item
List local and remote input devices:
@example
ffmpeg -f libndi_newtek -extra_ips "192.168.10.10" -find_sources 1 -i dummy
@end example
@item @item
Restream to NDI: Restream to NDI:
@example @example
ffmpeg -f libndi_newtek -i "DEV-5.INTERNAL.M1STEREO.TV (NDI_SOURCE_NAME_1)" -f libndi_newtek -y NDI_SOURCE_NAME_2 ffmpeg -f libndi_newtek -i "DEV-5.INTERNAL.M1STEREO.TV (NDI_SOURCE_NAME_1)" -f libndi_newtek -y NDI_SOURCE_NAME_2
@end example @end example
@item
Restream remote NDI to local NDI:
@example
ffmpeg -f libndi_newtek -extra_ips "192.168.10.10" -i "DEV-5.REMOTE.M1STEREO.TV (NDI_SOURCE_NAME_1)" -f libndi_newtek -y NDI_SOURCE_NAME_2
@end example
@end itemize @end itemize
@section openal @section openal

4
libavdevice/libndi_newtek_dec.c
View File

@ -33,6 +33,7 @@ struct NDIContext {
int find_sources; int find_sources;
int64_t wait_sources; int64_t wait_sources;
int allow_video_fields; int allow_video_fields;
char *extra_ips;
/* Runtime */ /* Runtime */
NDIlib_recv_create_t *recv; NDIlib_recv_create_t *recv;
@ -99,7 +100,7 @@ static int ndi_find_sources(AVFormatContext *avctx, const char *name, NDIlib_sou
struct NDIContext *ctx = avctx->priv_data; struct NDIContext *ctx = avctx->priv_data;
const NDIlib_source_t *ndi_srcs = NULL; const NDIlib_source_t *ndi_srcs = NULL;
const NDIlib_find_create_t find_create_desc = { .show_local_sources = true, const NDIlib_find_create_t find_create_desc = { .show_local_sources = true,
.p_groups = NULL, .p_extra_ips = NULL }; .p_groups = NULL, .p_extra_ips = ctx->extra_ips };
if (!ctx->ndi_find) if (!ctx->ndi_find)
ctx->ndi_find = NDIlib_find_create2(&find_create_desc); ctx->ndi_find = NDIlib_find_create2(&find_create_desc);
@ -317,6 +318,7 @@ static const AVOption options[] = {
{ "find_sources", "Find available sources" , OFFSET(find_sources), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC }, { "find_sources", "Find available sources" , OFFSET(find_sources), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC },
{ "wait_sources", "Time to wait until the number of online sources have changed" , OFFSET(wait_sources), AV_OPT_TYPE_DURATION, { .i64 = 1000000 }, 100000, 20000000, DEC }, { "wait_sources", "Time to wait until the number of online sources have changed" , OFFSET(wait_sources), AV_OPT_TYPE_DURATION, { .i64 = 1000000 }, 100000, 20000000, DEC },
{ "allow_video_fields", "When this flag is FALSE, all video that you receive will be progressive" , OFFSET(allow_video_fields), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, DEC }, { "allow_video_fields", "When this flag is FALSE, all video that you receive will be progressive" , OFFSET(allow_video_fields), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, DEC },
{ "extra_ips", "List of comma separated ip addresses to scan for remote sources", OFFSET(extra_ips), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC },
{ NULL }, { NULL },
}; };

2
libavdevice/version.h
View File

@ -29,7 +29,7 @@
#define LIBAVDEVICE_VERSION_MAJOR 58 #define LIBAVDEVICE_VERSION_MAJOR 58
#define LIBAVDEVICE_VERSION_MINOR 4 #define LIBAVDEVICE_VERSION_MINOR 4
#define LIBAVDEVICE_VERSION_MICRO 106 #define LIBAVDEVICE_VERSION_MICRO 107
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
LIBAVDEVICE_VERSION_MINOR, \ LIBAVDEVICE_VERSION_MINOR, \