stream_out: standard: add 'srt'
authorJustin Kim <justin.kim@collabora.com>
Wed, 27 Sep 2017 05:02:35 +0000 (14:02 +0900)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 5 Oct 2017 16:58:22 +0000 (18:58 +0200)
SRT is similar to UDP.

Signed-off-by: Justin Kim <justin.kim@collabora.com>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
configure.ac
modules/stream_out/Makefile.am
modules/stream_out/standard.c

index 5de9a70..b4b731a 100644 (file)
@@ -3887,7 +3887,7 @@ AM_CONDITIONAL([HAVE_LIRC], [test "${have_lirc}" = "yes"])
 dnl
 dnl  SRT plugin
 dnl
-PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.0], [SRT input/output plugin], [auto])
+PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
 
 EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
 dnl
index ba84a3c..8a536d3 100644 (file)
@@ -6,6 +6,7 @@ libstream_out_delay_plugin_la_SOURCES = stream_out/delay.c
 libstream_out_stats_plugin_la_SOURCES = stream_out/stats.c
 libstream_out_description_plugin_la_SOURCES = stream_out/description.c
 libstream_out_standard_plugin_la_SOURCES = stream_out/standard.c
+libstream_out_standard_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_access_output_srt)
 libstream_out_standard_plugin_la_LIBADD = $(SOCKET_LIBS)
 libstream_out_duplicate_plugin_la_SOURCES = stream_out/duplicate.c
 libstream_out_es_plugin_la_SOURCES = stream_out/es.c
index d835e6f..8f78702 100644 (file)
@@ -82,11 +82,17 @@ static void     Close   ( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-standard-"
 
+#ifdef ENABLE_SRT
+#define SRT_SHORTCUT "srt"
+#else
+#define SRT_SHORTCUT
+#endif
+
 vlc_module_begin ()
     set_shortname( N_("Standard"))
     set_description( N_("Standard stream output") )
     set_capability( "sout stream", 50 )
-    add_shortcut( "standard", "std", "file", "http", "udp" )
+    add_shortcut( "standard", "std", "file", "http", "udp", SRT_SHORTCUT )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )