diff mbox

[FFmpeg-devel,v2] libavdevice/libndi_newtek: Added extra_ips option to libndi_newtek allowing use remote network sources

Message ID 1540817851-2155-1-git-send-email-anton@platov.net
State New
Headers show

Commit Message

Anton Platov Oct. 29, 2018, 12:57 p.m. UTC 
Signed-off-by: Anton Platov <anton@platov.net>
---
 doc/indevs.texi                 | 17 +++++++++++++++++
 libavdevice/libndi_newtek_dec.c |  4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)

Comments

Marton Balint Nov. 1, 2018, 6:07 p.m. UTC | #1 
On Mon, 29 Oct 2018, Anton Platov wrote:

>        Signed-off-by: Anton Platov <anton@platov.net>
> ---
> doc/indevs.texi                 | 17 +++++++++++++++++
> libavdevice/libndi_newtek_dec.c |  4 +++-
> 2 files changed, 20 insertions(+), 1 deletion(-)
>

Thanks, pushed.

Regards,
Marton
diff mbox

Patch

diff --git a/doc/indevs.texi b/doc/indevs.texi
index 9a9cb69..c75c4b1 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -1078,6 +1078,10 @@  Defaults to @option{0.5}.
 When this flag is @option{false}, all video that you receive will be progressive.
 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
 
 @subsection Examples
@@ -1091,11 +1095,24 @@  ffmpeg -f libndi_newtek -find_sources 1 -i dummy
 @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
 Restream to NDI:
 @example
 ffmpeg -f libndi_newtek -i "DEV-5.INTERNAL.M1STEREO.TV (NDI_SOURCE_NAME_1)" -f libndi_newtek -y NDI_SOURCE_NAME_2
 @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
 
 @section openal
diff --git a/libavdevice/libndi_newtek_dec.c b/libavdevice/libndi_newtek_dec.c
index 4fb7197..d2d5648 100644
--- a/libavdevice/libndi_newtek_dec.c
+++ b/libavdevice/libndi_newtek_dec.c
@@ -33,6 +33,7 @@  struct NDIContext {
     int find_sources;
     int64_t wait_sources;
     int allow_video_fields;
+    char *extra_ips;
 
     /* Runtime */
     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;
     const NDIlib_source_t *ndi_srcs = NULL;
     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)
         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 },
     { "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 },
+    { "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 },
 };