[vlc-devel] [PATCH 16/18] opengl: rename converters modules to importers

Romain Vimont rom1v at videolabs.io
Fri Dec 20 15:48:58 CET 2019


The "converter" modules are now only "importer" modules.
---
 modules/video_output/Makefile.am                 | 16 ++++++++--------
 .../{converter_android.c => importer_android.c}  |  0
 .../opengl/{converter_sw.c => importer_sw.c}     |  0
 .../{converter_vaapi.c => importer_vaapi.c}      |  0
 .../{converter_vdpau.c => importer_vdpau.c}      |  0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename modules/video_output/opengl/{converter_android.c => importer_android.c} (100%)
 rename modules/video_output/opengl/{converter_sw.c => importer_sw.c} (100%)
 rename modules/video_output/opengl/{converter_vaapi.c => importer_vaapi.c} (100%)
 rename modules/video_output/opengl/{converter_vdpau.c => importer_vdpau.c} (100%)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 3c1bee98cb..6a7b5bbd14 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -4,10 +4,10 @@ vout_LTLIBRARIES =
 EXTRA_DIST += video_output/README
 
 OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \
-	video_output/opengl/gl_common.h \
+	video_output/opengl/gl_common.h video_output/opengl/importer.h \
 	video_output/opengl/vout_helper.h video_output/opengl/converter.h \
 	video_output/opengl/internal.h video_output/opengl/fragment_shaders.c \
-	video_output/opengl/converter_sw.c
+	video_output/opengl/importer_sw.c
 if HAVE_LIBPLACEBO
 OPENGL_COMMONSOURCES += video_output/placebo_utils.c video_output/placebo_utils.h
 endif
@@ -86,14 +86,14 @@ libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS
 libgl_plugin_la_LIBADD += $(GL_LIBS)
 endif
 
-libglconv_vaapi_plugin_la_SOURCES = video_output/opengl/converter_vaapi.c \
-	video_output/opengl/converter.h \
+libglconv_vaapi_plugin_la_SOURCES = video_output/opengl/importer_vaapi.c \
+	video_output/opengl/importer.h \
 	hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h
 libglconv_vaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
 libglconv_vaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS)
 
-libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/converter_vdpau.c \
-	video_output/opengl/converter.h hw/vdpau/picture.c hw/vdpau/vlc_vdpau.h
+libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/importer_vdpau.c \
+	video_output/opengl/importer.h hw/vdpau/picture.c hw/vdpau/vlc_vdpau.h
 libglconv_vdpau_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
 libglconv_vdpau_plugin_la_LIBADD = $(LIBDL) libvlc_vdpau.la $(X_LIBS) $(X_PRE_LIBS) -lX11
 
@@ -279,8 +279,8 @@ libandroid_display_plugin_la_SOURCES = video_output/android/display.c \
 libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_display_plugin_la_LIBADD = $(LIBDL)
 
-libglconv_android_plugin_la_SOURCES = video_output/opengl/converter_android.c \
-	video_output/opengl/converter.h
+libglconv_android_plugin_la_SOURCES = video_output/opengl/importer_android.c \
+	video_output/opengl/importer.h
 libglconv_android_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2
 
 if HAVE_ANDROID
diff --git a/modules/video_output/opengl/converter_android.c b/modules/video_output/opengl/importer_android.c
similarity index 100%
rename from modules/video_output/opengl/converter_android.c
rename to modules/video_output/opengl/importer_android.c
diff --git a/modules/video_output/opengl/converter_sw.c b/modules/video_output/opengl/importer_sw.c
similarity index 100%
rename from modules/video_output/opengl/converter_sw.c
rename to modules/video_output/opengl/importer_sw.c
diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/importer_vaapi.c
similarity index 100%
rename from modules/video_output/opengl/converter_vaapi.c
rename to modules/video_output/opengl/importer_vaapi.c
diff --git a/modules/video_output/opengl/converter_vdpau.c b/modules/video_output/opengl/importer_vdpau.c
similarity index 100%
rename from modules/video_output/opengl/converter_vdpau.c
rename to modules/video_output/opengl/importer_vdpau.c
-- 
2.24.1



More information about the vlc-devel mailing list