[vlc-commits] [Git][videolan/vlc][master] 7 commits: core: don't export internal API that don't have VLC_API
Steve Lhomme (@robUx4)
gitlab at videolan.org
Thu Jun 20 11:50:21 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
c7e76115 by Steve Lhomme at 2024-06-20T11:31:56+00:00
core: don't export internal API that don't have VLC_API
- - - - -
65abd212 by Steve Lhomme at 2024-06-20T11:31:56+00:00
liblvlc-module: export the copyright/license DLL entries
They are exported in libvlccore.sym.
This is the same declaration as VLC_COPYRIGHT_EXPORT and VLC_LICENSE_EXPORT but
with VLC_API.
- - - - -
b1a0ed0c by Steve Lhomme at 2024-06-20T11:31:56+00:00
vlc_plugin: move some category parameter into the core
They are only meant to be used by the core and hidden for the rest since
3a82d263b558b3402c5656a20b76895460228e54.
- - - - -
1d0dbbe6 by Steve Lhomme at 2024-06-20T11:31:56+00:00
buildsystem: make gen-vlc-about executable
So it can be called from the shell directly.
- - - - -
f5227c01 by Steve Lhomme at 2024-06-20T11:31:56+00:00
video_chroma: avoid defining PLUGIN_PLAIN
If SSE2 and ALTIVEC is not set, it's the plain plugin
- - - - -
391b682a by Steve Lhomme at 2024-06-20T11:31:56+00:00
ttml: fix local path include
- - - - -
785888ad by Steve Lhomme at 2024-06-20T11:31:56+00:00
http-put: fix local path includes
- - - - -
11 changed files:
- buildsystem/gen-vlc-about.py
- include/vlc_plugin.h
- modules/access_output/http-put.c
- modules/codec/ttml/encttml.c
- modules/codec/ttml/genttml.c
- modules/video_chroma/Makefile.am
- modules/video_chroma/i420_yuy2.c
- modules/video_chroma/i422_yuy2.c
- modules/video_chroma/meson.build
- src/libvlc-module.c
- src/libvlccore.sym
Changes:
=====================================
buildsystem/gen-vlc-about.py
=====================================
=====================================
include/vlc_plugin.h
=====================================
@@ -427,11 +427,6 @@ VLC_METADATA_EXPORTS
#define set_section( text, longtext ) \
add_typedesc_inner( CONFIG_SECTION, text, longtext )
-#ifndef VLC_DYNAMIC_PLUGIN
-#define add_category_hint(text, longtext) \
- add_typedesc_inner( CONFIG_HINT_CATEGORY, text, longtext )
-#endif
-
#define add_string( name, value, text, longtext ) \
add_string_inner(CONFIG_ITEM_STRING, name, text, longtext, value)
@@ -458,17 +453,6 @@ VLC_METADATA_EXPORTS
add_string_inner(CONFIG_ITEM_MODULE_LIST, name, text, longtext, value) \
vlc_config_set (VLC_CONFIG_CAPABILITY, VLC_CHECKED_TYPE(const char *, cap));
-#ifndef VLC_DYNAMIC_PLUGIN
-#define add_module_cat(name, subcategory, value, text, longtext) \
- add_string_inner(CONFIG_ITEM_MODULE_CAT, name, text, longtext, value) \
- change_integer_range (subcategory /* gruik */, 0)
-
-#define add_module_list_cat(name, subcategory, value, text, longtext) \
- add_string_inner(CONFIG_ITEM_MODULE_LIST_CAT, name, text, longtext, \
- value) \
- change_integer_range (subcategory /* gruik */, 0)
-#endif
-
#define add_integer( name, value, text, longtext ) \
add_int_inner(CONFIG_ITEM_INTEGER, name, text, longtext, value)
=====================================
modules/access_output/http-put.c
=====================================
@@ -28,8 +28,8 @@
#include <vlc_sout.h>
#include <vlc_block.h>
#include <vlc_strings.h>
-#include "connmgr.h"
-#include "outfile.h"
+#include "../access/http/connmgr.h"
+#include "../access/http/outfile.h"
#define SOUT_CFG_PREFIX "sout-http-put-"
=====================================
modules/codec/ttml/encttml.c
=====================================
@@ -27,7 +27,7 @@
#include <vlc_codec.h>
#include <vlc_subpicture.h>
-#include "../codec/ttml/ttml.h"
+#include "ttml.h"
#define HEX_COLOR_MAX 10
static void FillHexColor( uint32_t argb, bool withalpha, char text[HEX_COLOR_MAX] )
=====================================
modules/codec/ttml/genttml.c
=====================================
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <ctype.h>
-#include "../codec/ttml/ttml.h"
+#include "ttml.h"
char *tt_genTiming( tt_time_t t )
{
=====================================
modules/video_chroma/Makefile.am
=====================================
@@ -17,7 +17,6 @@ libi420_rgb_plugin_la_SOURCES = video_chroma/i420_rgb.c video_chroma/i420_rgb.h
video_chroma/i420_rgb8.c video_chroma/i420_rgb16.c video_chroma/i420_rgb_c.h
libi420_yuy2_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h
-libi420_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_PLAIN
libi420_nv12_plugin_la_SOURCES = video_chroma/i420_nv12.c
libi420_nv12_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -26,7 +25,6 @@ libi420_nv12_plugin_la_LIBADD = libchroma_copy.la
libi422_i420_plugin_la_SOURCES = video_chroma/i422_i420.c
libi422_yuy2_plugin_la_SOURCES = video_chroma/i422_yuy2.c video_chroma/i422_yuy2.h
-libi422_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_PLAIN
librv32_plugin_la_SOURCES = video_chroma/rv32.c
=====================================
modules/video_chroma/i420_yuy2.c
=====================================
@@ -43,15 +43,16 @@
#define SRC_FOURCC "I420,IYUV,YV12"
-#if defined (PLUGIN_PLAIN)
-# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,Y211"
-# define VLC_TARGET
-#elif defined (PLUGIN_SSE2)
+#if defined (PLUGIN_SSE2)
# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422"
# define VLC_TARGET VLC_SSE
#elif defined (PLUGIN_ALTIVEC)
# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422"
# define VLC_TARGET VLC_ALTIVEC
+#else
+# define PLUGIN_PLAIN
+# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,Y211"
+# define VLC_TARGET
#endif
/*****************************************************************************
=====================================
modules/video_chroma/i422_yuy2.c
=====================================
@@ -38,7 +38,7 @@
#include "i422_yuy2.h"
#define SRC_FOURCC "I422"
-#if defined (PLUGIN_PLAIN)
+#if !defined (PLUGIN_SSE2)
# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,Y211"
#else
# define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422"
@@ -53,16 +53,17 @@ static int Activate ( filter_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
-#if defined (PLUGIN_PLAIN)
- set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
- set_callback_video_converter( Activate, 80 )
-# define vlc_CPU_capable() (true)
-# define VLC_TARGET
-#elif defined (PLUGIN_SSE2)
+#if defined (PLUGIN_SSE2)
set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) )
set_callback_video_converter( Activate, 120 )
# define vlc_CPU_capable() vlc_CPU_SSE2()
# define VLC_TARGET VLC_SSE
+#else
+ set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+ set_callback_video_converter( Activate, 80 )
+# define PLUGIN_PLAIN
+# define vlc_CPU_capable() (true)
+# define VLC_TARGET
#endif
vlc_module_end ()
=====================================
modules/video_chroma/meson.build
=====================================
@@ -43,14 +43,12 @@ vlc_modules += {
vlc_modules += {
'name' : 'i420_yuy2',
'sources' : files('i420_yuy2.c'),
- 'c_args' : ['-DPLUGIN_PLAIN']
}
vlc_modules += {
'name' : 'i420_nv12',
'sources' : files('i420_nv12.c'),
'link_with' : [chroma_copy_lib],
- 'c_args' : ['-DPLUGIN_PLAIN'],
}
vlc_modules += {
@@ -61,7 +59,6 @@ vlc_modules += {
vlc_modules += {
'name' : 'i422_yuy2',
'sources' : files('i422_yuy2.c'),
- 'c_args' : ['-DPLUGIN_PLAIN']
}
vlc_modules += {
=====================================
src/libvlc-module.c
=====================================
@@ -48,6 +48,15 @@
#include "clock/clock.h"
+#ifdef HAVE_DYNAMIC_PLUGINS
+#define VLC_META_EXPORT_DECL( name, value ) \
+ VLC_API const char * CDECL_SYMBOL \
+ VLC_SYMBOL(vlc_entry_ ## name)(void); \
+
+VLC_META_EXPORT_DECL(copyright, VLC_MODULE_COPYRIGHT)
+VLC_META_EXPORT_DECL(license, VLC_MODULE_LICENSE)
+#endif
+
static const char *const ppsz_snap_formats[] =
{ "png", "jpg", "tiff", "webp" };
@@ -1559,6 +1568,18 @@ static const char *const mouse_wheel_texts[] = {
* add_bool( option_name, b_value, N_(text), N_(longtext) )
*/
+#define add_category_hint(text, longtext) \
+ add_typedesc_inner( CONFIG_HINT_CATEGORY, text, longtext )
+
+#define add_module_cat(name, subcategory, value, text, longtext) \
+ add_string_inner(CONFIG_ITEM_MODULE_CAT, name, text, longtext, value) \
+ change_integer_range (subcategory /* gruik */, 0)
+
+#define add_module_list_cat(name, subcategory, value, text, longtext) \
+ add_string_inner(CONFIG_ITEM_MODULE_LIST_CAT, name, text, longtext, \
+ value) \
+ change_integer_range (subcategory /* gruik */, 0)
+
vlc_module_begin ()
set_description( N_("core program") )
=====================================
src/libvlccore.sym
=====================================
@@ -235,10 +235,6 @@ vlc_readdir_helper_finish
vlc_readdir_helper_additem
intf_Create
libvlc_InternalAddIntf
-libvlc_InternalDialogInit
-libvlc_InternalDialogClean
-libvlc_InternalKeystoreInit
-libvlc_InternalKeystoreClean
libvlc_InternalPlay
libvlc_InternalCleanup
libvlc_InternalCreate
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/68f669feb50e9524475c09c20a51193f41eeacfc...785888ad9667159be5321a75623563da385aa2f5
--
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/68f669feb50e9524475c09c20a51193f41eeacfc...785888ad9667159be5321a75623563da385aa2f5
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list