Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
4b32f8b3
Commit
4b32f8b3
authored
Mar 09, 2019
by
Carl Eugen Hoyos
Committed by
Kieran Kunhya
Mar 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavd: Remove libndi_newtek
parent
6b5ea90e
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
3 additions
and
796 deletions
+3
-796
Changelog
Changelog
+1
-0
configure
configure
+0
-7
indevs.texi
doc/indevs.texi
+0
-65
outdevs.texi
doc/outdevs.texi
+0
-45
Makefile
libavdevice/Makefile
+0
-4
alldevices.c
libavdevice/alldevices.c
+0
-2
libndi_newtek_common.h
libavdevice/libndi_newtek_common.h
+0
-30
libndi_newtek_dec.c
libavdevice/libndi_newtek_dec.c
+0
-342
libndi_newtek_enc.c
libavdevice/libndi_newtek_enc.c
+0
-299
version.h
libavdevice/version.h
+2
-2
No files found.
Changelog
View file @
4b32f8b3
...
@@ -19,6 +19,7 @@ version <next>:
...
@@ -19,6 +19,7 @@ version <next>:
- ARBC decoder
- ARBC decoder
- libaribb24 based ARIB STD-B24 caption support (profiles A and C)
- libaribb24 based ARIB STD-B24 caption support (profiles A and C)
- Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
- Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
- removed libndi-newtek
version 4.1:
version 4.1:
...
...
configure
View file @
4b32f8b3
...
@@ -298,7 +298,6 @@ External library support:
...
@@ -298,7 +298,6 @@ External library support:
--enable-lv2 enable LV2 audio filtering [no]
--enable-lv2 enable LV2 audio filtering [no]
--disable-lzma disable lzma [autodetect]
--disable-lzma disable lzma [autodetect]
--enable-decklink enable Blackmagic DeckLink I/O support [no]
--enable-decklink enable Blackmagic DeckLink I/O support [no]
--enable-libndi_newtek enable Newteck NDI I/O support [no]
--enable-mbedtls enable mbedTLS, needed for https support
--enable-mbedtls enable mbedTLS, needed for https support
if openssl, gnutls or libtls is not used [no]
if openssl, gnutls or libtls is not used [no]
--enable-mediacodec enable Android MediaCodec support [no]
--enable-mediacodec enable Android MediaCodec support [no]
...
@@ -1713,7 +1712,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
...
@@ -1713,7 +1712,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
EXTERNAL_LIBRARY_NONFREE_LIST
=
"
EXTERNAL_LIBRARY_NONFREE_LIST
=
"
decklink
decklink
libndi_newtek
libfdk_aac
libfdk_aac
openssl
openssl
libtls
libtls
...
@@ -3299,10 +3297,6 @@ decklink_indev_extralibs="-lstdc++"
...
@@ -3299,10 +3297,6 @@ decklink_indev_extralibs="-lstdc++"
decklink_outdev_deps
=
"decklink threads"
decklink_outdev_deps
=
"decklink threads"
decklink_outdev_suggest
=
"libklvanc"
decklink_outdev_suggest
=
"libklvanc"
decklink_outdev_extralibs
=
"-lstdc++"
decklink_outdev_extralibs
=
"-lstdc++"
libndi_newtek_indev_deps
=
"libndi_newtek"
libndi_newtek_indev_extralibs
=
"-lndi"
libndi_newtek_outdev_deps
=
"libndi_newtek"
libndi_newtek_outdev_extralibs
=
"-lndi"
dshow_indev_deps
=
"IBaseFilter"
dshow_indev_deps
=
"IBaseFilter"
dshow_indev_extralibs
=
"-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
dshow_indev_extralibs
=
"-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
fbdev_indev_deps
=
"linux_fb_h"
fbdev_indev_deps
=
"linux_fb_h"
...
@@ -6122,7 +6116,6 @@ enabled cuda_nvcc && { check_nvcc || die "ERROR: failed checking for nvc
...
@@ -6122,7 +6116,6 @@ enabled cuda_nvcc && { check_nvcc || die "ERROR: failed checking for nvc
enabled chromaprint
&&
require chromaprint chromaprint.h chromaprint_get_version
-lchromaprint
enabled chromaprint
&&
require chromaprint chromaprint.h chromaprint_get_version
-lchromaprint
enabled decklink
&&
{
require_headers DeckLinkAPI.h
&&
enabled decklink
&&
{
require_headers DeckLinkAPI.h
&&
{
test_cpp_condition DeckLinkAPIVersion.h
"BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a090500"
||
die
"ERROR: Decklink API version must be >= 10.9.5."
;
}
}
{
test_cpp_condition DeckLinkAPIVersion.h
"BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a090500"
||
die
"ERROR: Decklink API version must be >= 10.9.5."
;
}
}
enabled libndi_newtek
&&
require_headers Processing.NDI.Lib.h
enabled frei0r
&&
require_headers
"frei0r.h dlfcn.h"
enabled frei0r
&&
require_headers
"frei0r.h dlfcn.h"
enabled gmp
&&
require gmp gmp.h mpz_export
-lgmp
enabled gmp
&&
require gmp gmp.h mpz_export
-lgmp
enabled gnutls
&&
require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init
enabled gnutls
&&
require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init
...
...
doc/indevs.texi
View file @
4b32f8b3
...
@@ -1065,71 +1065,6 @@ Set the video size given as a string such as @code{640x480} or @code{hd720}.
...
@@ -1065,71 +1065,6 @@ Set the video size given as a string such as @code{640x480} or @code{hd720}.
Default is @code{qvga}.
Default is @code{qvga}.
@end table
@end table
@section libndi_newtek
The libndi_newtek input device provides capture capabilities for using NDI (Network
Device Interface, standard created by NewTek).
Input filename is a NDI source name that could be found by sending -find_sources 1
to command line - it has no specific syntax but human-readable formatted.
To enable this input device, you need the NDI SDK and you
need to configure with the appropriate @code{--extra-cflags}
and @code{--extra-ldflags}.
@subsection Options
@table @option
@item find_sources
If set to @option{true}, print a list of found/available NDI sources and exit.
Defaults to @option{false}.
@item wait_sources
Override time to wait until the number of online sources have changed.
Defaults to @option{0.5}.
@item allow_video_fields
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
@itemize
@item
List input devices:
@example
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
@section openal
The OpenAL input device provides audio capture on all systems with a
The OpenAL input device provides audio capture on all systems with a
...
...
doc/outdevs.texi
View file @
4b32f8b3
...
@@ -220,51 +220,6 @@ ffmpeg -re -i INPUT -c:v rawvideo -pix_fmt bgra -f fbdev /dev/fb0
...
@@ -220,51 +220,6 @@ ffmpeg -re -i INPUT -c:v rawvideo -pix_fmt bgra -f fbdev /dev/fb0
See also @url{http://linux-fbdev.sourceforge.net/}, and fbset(1).
See also @url{http://linux-fbdev.sourceforge.net/}, and fbset(1).
@section libndi_newtek
The libndi_newtek output device provides playback capabilities for using NDI (Network
Device Interface, standard created by NewTek).
Output filename is a NDI name.
To enable this output device, you need the NDI SDK and you
need to configure with the appropriate @code{--extra-cflags}
and @code{--extra-ldflags}.
NDI uses uyvy422 pixel format natively, but also supports bgra, bgr0, rgba and
rgb0.
@subsection Options
@table @option
@item reference_level
The audio reference level in dB. This specifies how many dB above the
reference level (+4dBU) is the full range of 16 bit audio.
Defaults to @option{0}.
@item clock_video
These specify whether video "clock" themselves.
Defaults to @option{false}.
@item clock_audio
These specify whether audio "clock" themselves.
Defaults to @option{false}.
@end table
@subsection Examples
@itemize
@item
Play video clip:
@example
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
@end example
@end itemize
@section opengl
@section opengl
OpenGL output device.
OpenGL output device.
...
...
libavdevice/Makefile
View file @
4b32f8b3
...
@@ -20,8 +20,6 @@ OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
...
@@ -20,8 +20,6 @@ OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
OBJS-$(CONFIG_CACA_OUTDEV)
+=
caca.o
OBJS-$(CONFIG_CACA_OUTDEV)
+=
caca.o
OBJS-$(CONFIG_DECKLINK_OUTDEV)
+=
decklink_enc.o
decklink_enc_c.o
decklink_common.o
OBJS-$(CONFIG_DECKLINK_OUTDEV)
+=
decklink_enc.o
decklink_enc_c.o
decklink_common.o
OBJS-$(CONFIG_DECKLINK_INDEV)
+=
decklink_dec.o
decklink_dec_c.o
decklink_common.o
OBJS-$(CONFIG_DECKLINK_INDEV)
+=
decklink_dec.o
decklink_dec_c.o
decklink_common.o
OBJS-$(CONFIG_LIBNDI_NEWTEK_OUTDEV)
+=
libndi_newtek_enc.o
OBJS-$(CONFIG_LIBNDI_NEWTEK_INDEV)
+=
libndi_newtek_dec.o
OBJS-$(CONFIG_DSHOW_INDEV)
+=
dshow_crossbar.o
dshow.o
dshow_enummediatypes.o
\
OBJS-$(CONFIG_DSHOW_INDEV)
+=
dshow_crossbar.o
dshow.o
dshow_enummediatypes.o
\
dshow_enumpins.o
dshow_filter.o
\
dshow_enumpins.o
dshow_filter.o
\
dshow_pin.o
dshow_common.o
dshow_pin.o
dshow_common.o
...
@@ -61,8 +59,6 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o
...
@@ -61,8 +59,6 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o
SKIPHEADERS
+=
decklink_common.h
SKIPHEADERS
+=
decklink_common.h
SKIPHEADERS-$(CONFIG_DECKLINK)
+=
decklink_enc.h
decklink_dec.h
\
SKIPHEADERS-$(CONFIG_DECKLINK)
+=
decklink_enc.h
decklink_dec.h
\
decklink_common_c.h
decklink_common_c.h
SKIPHEADERS-$(CONFIG_LIBNDI_NEWTEK_INDEV)
+=
libndi_newtek_common.h
SKIPHEADERS-$(CONFIG_LIBNDI_NEWTEK_OUTDEV)
+=
libndi_newtek_common.h
SKIPHEADERS-$(CONFIG_DSHOW_INDEV)
+=
dshow_capture.h
SKIPHEADERS-$(CONFIG_DSHOW_INDEV)
+=
dshow_capture.h
SKIPHEADERS-$(CONFIG_FBDEV_INDEV)
+=
fbdev_common.h
SKIPHEADERS-$(CONFIG_FBDEV_INDEV)
+=
fbdev_common.h
SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV)
+=
fbdev_common.h
SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV)
+=
fbdev_common.h
...
...
libavdevice/alldevices.c
View file @
4b32f8b3
...
@@ -32,8 +32,6 @@ extern AVInputFormat ff_bktr_demuxer;
...
@@ -32,8 +32,6 @@ extern AVInputFormat ff_bktr_demuxer;
extern
AVOutputFormat
ff_caca_muxer
;
extern
AVOutputFormat
ff_caca_muxer
;
extern
AVInputFormat
ff_decklink_demuxer
;
extern
AVInputFormat
ff_decklink_demuxer
;
extern
AVOutputFormat
ff_decklink_muxer
;
extern
AVOutputFormat
ff_decklink_muxer
;
extern
AVInputFormat
ff_libndi_newtek_demuxer
;
extern
AVOutputFormat
ff_libndi_newtek_muxer
;
extern
AVInputFormat
ff_dshow_demuxer
;
extern
AVInputFormat
ff_dshow_demuxer
;
extern
AVInputFormat
ff_fbdev_demuxer
;
extern
AVInputFormat
ff_fbdev_demuxer
;
extern
AVOutputFormat
ff_fbdev_muxer
;
extern
AVOutputFormat
ff_fbdev_muxer
;
...
...
libavdevice/libndi_newtek_common.h
deleted
100644 → 0
View file @
6b5ea90e
/*
* NewTek NDI common code
* Copyright (c) 2017 Maksym Veremeyenko
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVDEVICE_LIBNDI_NEWTEK_COMMON_H
#define AVDEVICE_LIBNDI_NEWTEK_COMMON_H
#include <Processing.NDI.Lib.h>
#define NDI_TIME_BASE 10000000
#define NDI_TIME_BASE_Q (AVRational){1, NDI_TIME_BASE}
#endif
libavdevice/libndi_newtek_dec.c
deleted
100644 → 0
View file @
6b5ea90e
This diff is collapsed.
Click to expand it.
libavdevice/libndi_newtek_enc.c
deleted
100644 → 0
View file @
6b5ea90e
This diff is collapsed.
Click to expand it.
libavdevice/version.h
View file @
4b32f8b3
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
#include "libavutil/version.h"
#define LIBAVDEVICE_VERSION_MAJOR 58
#define LIBAVDEVICE_VERSION_MAJOR 58
#define LIBAVDEVICE_VERSION_MINOR
6
#define LIBAVDEVICE_VERSION_MINOR
7
#define LIBAVDEVICE_VERSION_MICRO 10
1
#define LIBAVDEVICE_VERSION_MICRO 10
0
#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, \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment