Skip to content

Commit 4b32f8b

Browse files
cehoyoskierank
authored andcommitted
lavd: Remove libndi_newtek
1 parent 6b5ea90 commit 4b32f8b

File tree

10 files changed

+3
-796
lines changed

10 files changed

+3
-796
lines changed

Changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ version <next>:
1919
- ARBC decoder
2020
- libaribb24 based ARIB STD-B24 caption support (profiles A and C)
2121
- Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
22+
- removed libndi-newtek
2223

2324

2425
version 4.1:

configure

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ External library support:
298298
--enable-lv2 enable LV2 audio filtering [no]
299299
--disable-lzma disable lzma [autodetect]
300300
--enable-decklink enable Blackmagic DeckLink I/O support [no]
301-
--enable-libndi_newtek enable Newteck NDI I/O support [no]
302301
--enable-mbedtls enable mbedTLS, needed for https support
303302
if openssl, gnutls or libtls is not used [no]
304303
--enable-mediacodec enable Android MediaCodec support [no]
@@ -1713,7 +1712,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
17131712

17141713
EXTERNAL_LIBRARY_NONFREE_LIST="
17151714
decklink
1716-
libndi_newtek
17171715
libfdk_aac
17181716
openssl
17191717
libtls
@@ -3299,10 +3297,6 @@ decklink_indev_extralibs="-lstdc++"
32993297
decklink_outdev_deps="decklink threads"
33003298
decklink_outdev_suggest="libklvanc"
33013299
decklink_outdev_extralibs="-lstdc++"
3302-
libndi_newtek_indev_deps="libndi_newtek"
3303-
libndi_newtek_indev_extralibs="-lndi"
3304-
libndi_newtek_outdev_deps="libndi_newtek"
3305-
libndi_newtek_outdev_extralibs="-lndi"
33063300
dshow_indev_deps="IBaseFilter"
33073301
dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
33083302
fbdev_indev_deps="linux_fb_h"
@@ -6122,7 +6116,6 @@ enabled cuda_nvcc && { check_nvcc || die "ERROR: failed checking for nvc
61226116
enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint
61236117
enabled decklink && { require_headers DeckLinkAPI.h &&
61246118
{ test_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a090500" || die "ERROR: Decklink API version must be >= 10.9.5."; } }
6125-
enabled libndi_newtek && require_headers Processing.NDI.Lib.h
61266119
enabled frei0r && require_headers "frei0r.h dlfcn.h"
61276120
enabled gmp && require gmp gmp.h mpz_export -lgmp
61286121
enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init

doc/indevs.texi

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,71 +1065,6 @@ Set the video size given as a string such as @code{640x480} or @code{hd720}.
10651065
Default is @code{qvga}.
10661066
@end table
10671067

1068-
@section libndi_newtek
1069-
1070-
The libndi_newtek input device provides capture capabilities for using NDI (Network
1071-
Device Interface, standard created by NewTek).
1072-
1073-
Input filename is a NDI source name that could be found by sending -find_sources 1
1074-
to command line - it has no specific syntax but human-readable formatted.
1075-
1076-
To enable this input device, you need the NDI SDK and you
1077-
need to configure with the appropriate @code{--extra-cflags}
1078-
and @code{--extra-ldflags}.
1079-
1080-
@subsection Options
1081-
1082-
@table @option
1083-
1084-
@item find_sources
1085-
If set to @option{true}, print a list of found/available NDI sources and exit.
1086-
Defaults to @option{false}.
1087-
1088-
@item wait_sources
1089-
Override time to wait until the number of online sources have changed.
1090-
Defaults to @option{0.5}.
1091-
1092-
@item allow_video_fields
1093-
When this flag is @option{false}, all video that you receive will be progressive.
1094-
Defaults to @option{true}.
1095-
1096-
@item extra_ips
1097-
If is set to list of comma separated ip addresses, scan for sources not only
1098-
using mDNS but also use unicast ip addresses specified by this list.
1099-
1100-
@end table
1101-
1102-
@subsection Examples
1103-
1104-
@itemize
1105-
1106-
@item
1107-
List input devices:
1108-
@example
1109-
ffmpeg -f libndi_newtek -find_sources 1 -i dummy
1110-
@end example
1111-
1112-
@item
1113-
List local and remote input devices:
1114-
@example
1115-
ffmpeg -f libndi_newtek -extra_ips "192.168.10.10" -find_sources 1 -i dummy
1116-
@end example
1117-
1118-
@item
1119-
Restream to NDI:
1120-
@example
1121-
ffmpeg -f libndi_newtek -i "DEV-5.INTERNAL.M1STEREO.TV (NDI_SOURCE_NAME_1)" -f libndi_newtek -y NDI_SOURCE_NAME_2
1122-
@end example
1123-
1124-
@item
1125-
Restream remote NDI to local NDI:
1126-
@example
1127-
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
1128-
@end example
1129-
1130-
1131-
@end itemize
1132-
11331068
@section openal
11341069

11351070
The OpenAL input device provides audio capture on all systems with a

doc/outdevs.texi

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -220,51 +220,6 @@ ffmpeg -re -i INPUT -c:v rawvideo -pix_fmt bgra -f fbdev /dev/fb0
220220

221221
See also @url{http://linux-fbdev.sourceforge.net/}, and fbset(1).
222222

223-
@section libndi_newtek
224-
225-
The libndi_newtek output device provides playback capabilities for using NDI (Network
226-
Device Interface, standard created by NewTek).
227-
228-
Output filename is a NDI name.
229-
230-
To enable this output device, you need the NDI SDK and you
231-
need to configure with the appropriate @code{--extra-cflags}
232-
and @code{--extra-ldflags}.
233-
234-
NDI uses uyvy422 pixel format natively, but also supports bgra, bgr0, rgba and
235-
rgb0.
236-
237-
@subsection Options
238-
239-
@table @option
240-
241-
@item reference_level
242-
The audio reference level in dB. This specifies how many dB above the
243-
reference level (+4dBU) is the full range of 16 bit audio.
244-
Defaults to @option{0}.
245-
246-
@item clock_video
247-
These specify whether video "clock" themselves.
248-
Defaults to @option{false}.
249-
250-
@item clock_audio
251-
These specify whether audio "clock" themselves.
252-
Defaults to @option{false}.
253-
254-
@end table
255-
256-
@subsection Examples
257-
258-
@itemize
259-
260-
@item
261-
Play video clip:
262-
@example
263-
ffmpeg -i "udp://@@239.1.1.1:10480?fifo_size=1000000&overrun_nonfatal=1" -vf "scale=720:576,fps=fps=25,setdar=dar=16/9,format=pix_fmts=uyvy422" -f libndi_newtek NEW_NDI1
264-
@end example
265-
266-
@end itemize
267-
268223
@section opengl
269224
OpenGL output device.
270225

libavdevice/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
2020
OBJS-$(CONFIG_CACA_OUTDEV) += caca.o
2121
OBJS-$(CONFIG_DECKLINK_OUTDEV) += decklink_enc.o decklink_enc_c.o decklink_common.o
2222
OBJS-$(CONFIG_DECKLINK_INDEV) += decklink_dec.o decklink_dec_c.o decklink_common.o
23-
OBJS-$(CONFIG_LIBNDI_NEWTEK_OUTDEV) += libndi_newtek_enc.o
24-
OBJS-$(CONFIG_LIBNDI_NEWTEK_INDEV) += libndi_newtek_dec.o
2523
OBJS-$(CONFIG_DSHOW_INDEV) += dshow_crossbar.o dshow.o dshow_enummediatypes.o \
2624
dshow_enumpins.o dshow_filter.o \
2725
dshow_pin.o dshow_common.o
@@ -61,8 +59,6 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o
6159
SKIPHEADERS += decklink_common.h
6260
SKIPHEADERS-$(CONFIG_DECKLINK) += decklink_enc.h decklink_dec.h \
6361
decklink_common_c.h
64-
SKIPHEADERS-$(CONFIG_LIBNDI_NEWTEK_INDEV) += libndi_newtek_common.h
65-
SKIPHEADERS-$(CONFIG_LIBNDI_NEWTEK_OUTDEV) += libndi_newtek_common.h
6662
SKIPHEADERS-$(CONFIG_DSHOW_INDEV) += dshow_capture.h
6763
SKIPHEADERS-$(CONFIG_FBDEV_INDEV) += fbdev_common.h
6864
SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV) += fbdev_common.h

libavdevice/alldevices.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ extern AVInputFormat ff_bktr_demuxer;
3232
extern AVOutputFormat ff_caca_muxer;
3333
extern AVInputFormat ff_decklink_demuxer;
3434
extern AVOutputFormat ff_decklink_muxer;
35-
extern AVInputFormat ff_libndi_newtek_demuxer;
36-
extern AVOutputFormat ff_libndi_newtek_muxer;
3735
extern AVInputFormat ff_dshow_demuxer;
3836
extern AVInputFormat ff_fbdev_demuxer;
3937
extern AVOutputFormat ff_fbdev_muxer;

libavdevice/libndi_newtek_common.h

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)