[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: configure: clean the x262 check and fix typo
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sat Feb 22 15:18:08 UTC 2025
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
60b94fcb by Steve Lhomme at 2025-02-22T14:56:51+00:00
configure: clean the x262 check and fix typo
(cherry picked from commit 31938ff13aa6d56474e867fc3c4e72df1f66a359) (rebased)
rebased:
- the code around/inside is slightly different
- - - - -
41f1c168 by Steve Lhomme at 2025-02-22T14:56:51+00:00
nfs: fix libnfs API v2 support
Introduced in libnfs 6.0.0.
Co-authored-by: ronnie sahlberg <ronniesahlberg at gmail.com>
Co-authored-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc)
- - - - -
bb833e10 by Alexandre Janniaux at 2025-02-22T14:56:51+00:00
avparser: fix missing const
(cherry picked from commit 72992236eda5b11786b30e73a212146060e4f317)
- - - - -
b12613a8 by Steve Lhomme at 2025-02-22T14:56:51+00:00
include cassert instead of assert.h
cassert is the preferred way in C++. It doesn't contain static_assert
which is otherwise a keyword.
https://stackoverflow.com/a/43011752/1266123
https://en.cppreference.com/w/cpp/header/cassert
https://en.cppreference.com/w/cpp/language/static_assert
(cherry picked from commit 4c99f1a44ab6db4dba475327b2eed90405619bcd) (edited)
edited:
- 3.0 has less files in C++ (d3d11, medialibrary, renderer)
- some Qt files were moved in 4.0
- - - - -
26 changed files:
- configure.ac
- modules/access/dtv/bdagraph.cpp
- modules/access/nfs.c
- modules/audio_filter/channel_mixer/spatialaudio.cpp
- modules/gui/qt/components/info_panels.cpp
- modules/gui/qt/components/interface_widgets.cpp
- modules/gui/qt/components/playlist/playlist_model.cpp
- modules/gui/qt/components/preferences_widgets.hpp
- modules/gui/qt/components/simple_preferences.cpp
- modules/gui/qt/components/sout/profile_selector.cpp
- modules/gui/qt/dialogs/extended.cpp
- modules/gui/qt/dialogs/extensions.hpp
- modules/gui/qt/dialogs/help.cpp
- modules/gui/qt/dialogs/messages.cpp
- modules/gui/qt/dialogs/openurl.cpp
- modules/gui/qt/dialogs/plugins.cpp
- modules/gui/qt/dialogs/sout.cpp
- modules/gui/qt/dialogs_provider.hpp
- modules/gui/qt/extensions_manager.cpp
- modules/gui/qt/main_interface_win32.cpp
- modules/gui/skins2/controls/ctrl_generic.cpp
- modules/gui/skins2/src/vlcproc.cpp
- modules/gui/skins2/x11/x11_window.cpp
- modules/packetizer/avparser.c
- modules/services_discovery/upnp.cpp
- modules/stream_out/chromecast/chromecast_demux.cpp
Changes:
=====================================
configure.ac
=====================================
@@ -2952,7 +2952,7 @@ dnl H262 encoder plugin (lib262)
dnl
AC_ARG_ENABLE(x262,
[ --enable-x262 H262 encoding support with static libx262 (default disabled)])
-if test "${enable_x262}" != "no"; then
+AS_IF([test "${enable_x262}" != "no"], [
PKG_CHECK_MODULES(X262, x262, [
VLC_ADD_PLUGIN([x262])
VLC_ADD_LDFLAGS([x262],[${X262_LIBS}])
@@ -2963,12 +2963,12 @@ if test "${enable_x262}" != "no"; then
if echo ${X262_LIBS} |grep -q 'pthreadGC2'; then
VLC_ADD_CFLAGS([x262], [-DPTW32_STATIC_LIB])
fi
- ], [
- if test "${enable_x262}" = "yes"; then
- AC_MSG_ERROR([x262 module doesn't work without staticly compiled libx262.a])
- fi
+ ],[
+ AS_IF([test "${enable_x262}" = "yes"], [
+ AC_MSG_ERROR([x262 module does not work without statically compiled libx262.a])
+ ])
])
-fi
+])
dnl x265 encoder
PKG_ENABLE_MODULES_VLC([X265],, [x265], [HEVC/H.265 encoder], [auto])
=====================================
modules/access/dtv/bdagraph.cpp
=====================================
@@ -29,7 +29,7 @@
# include <config.h>
#endif
-#include <assert.h>
+#include <cassert>
#include <vlc_common.h>
#include <vlc_block.h>
=====================================
modules/access/nfs.c
=====================================
@@ -189,7 +189,8 @@ nfs_read_cb(int i_status, struct nfs_context *p_nfs, void *p_data,
else
{
p_sys->res.read.i_len = i_status;
- memcpy(p_sys->res.read.p_buf, p_data, i_status);
+ if (p_sys->res.read.p_buf != NULL && p_data != NULL)
+ memcpy(p_sys->res.read.p_buf, p_data, i_status);
}
}
@@ -209,9 +210,15 @@ FileRead(stream_t *p_access, void *p_buf, size_t i_len)
return 0;
p_sys->res.read.i_len = 0;
+#ifdef LIBNFS_API_V2
+ p_sys->res.read.p_buf = NULL;
+ if (nfs_read_async(p_sys->p_nfs, p_sys->p_nfsfh, p_buf, i_len, nfs_read_cb,
+ p_access) < 0)
+#else
p_sys->res.read.p_buf = p_buf;
if (nfs_read_async(p_sys->p_nfs, p_sys->p_nfsfh, i_len, nfs_read_cb,
p_access) < 0)
+#endif
{
msg_Err(p_access, "nfs_read_async failed");
return 0;
=====================================
modules/audio_filter/channel_mixer/spatialaudio.cpp
=====================================
@@ -28,7 +28,7 @@
# include "config.h"
#endif
-#include <assert.h>
+#include <cassert>
#include <vlc_common.h>
#include <vlc_plugin.h>
=====================================
modules/gui/qt/components/info_panels.cpp
=====================================
@@ -34,7 +34,7 @@
#include "dialogs/fingerprintdialog.hpp"
#include "adapters/chromaprint.hpp"
-#include <assert.h>
+#include <cassert>
#include <vlc_url.h>
#include <vlc_meta.h>
=====================================
modules/gui/qt/components/interface_widgets.cpp
=====================================
@@ -70,7 +70,7 @@ static inline int qrand() {
#endif
#include <math.h>
-#include <assert.h>
+#include <cassert>
#include <vlc_vout.h>
#include <vlc_vout_window.h>
=====================================
modules/gui/qt/components/playlist/playlist_model.cpp
=====================================
@@ -38,7 +38,7 @@
#include "sorting.h"
-#include <assert.h>
+#include <cassert>
#include <QFont>
#include <QAction>
#include <QStack>
=====================================
modules/gui/qt/components/preferences_widgets.hpp
=====================================
@@ -31,7 +31,7 @@
#endif
#include "qt.hpp"
-#include <assert.h>
+#include <cassert>
#include <QWidget>
=====================================
modules/gui/qt/components/simple_preferences.cpp
=====================================
@@ -48,7 +48,7 @@
#include <QScreen>
#include <QtAlgorithms>
#include <QDir>
-#include <assert.h>
+#include <cassert>
#include <math.h>
#define ICON_HEIGHT 48
=====================================
modules/gui/qt/components/sout/profile_selector.cpp
=====================================
@@ -39,7 +39,7 @@
#include <QListWidgetItem>
#include <QFontMetrics>
-#include <assert.h>
+#include <cassert>
#include <vlc_modules.h>
#define CATPROP2NAME( val ) QString("valueholder_%1").arg( val )
=====================================
modules/gui/qt/dialogs/extended.cpp
=====================================
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <assert.h>
+#include <cassert>
#include "dialogs/extended.hpp"
=====================================
modules/gui/qt/dialogs/extensions.hpp
=====================================
@@ -27,7 +27,7 @@
#include "qt.hpp"
#include <vlc_extensions.h>
-#include "assert.h"
+#include <cassert>
#include <QDialog>
class QObject;
=====================================
modules/gui/qt/dialogs/help.cpp
=====================================
@@ -44,7 +44,7 @@
#include <QDate>
#include <QPushButton>
-#include <assert.h>
+#include <cassert>
HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
=====================================
modules/gui/qt/dialogs/messages.cpp
=====================================
@@ -36,7 +36,7 @@
#include <QMutex>
#include <QMutexLocker>
-#include <assert.h>
+#include <cassert>
#include <vlc_common.h>
#include <vlc_input_item.h>
=====================================
modules/gui/qt/dialogs/openurl.cpp
=====================================
@@ -37,7 +37,7 @@
#include <QLabel>
#include <QVBoxLayout>
-#include <assert.h>
+#include <cassert>
OpenUrlDialog::OpenUrlDialog( intf_thread_t *_p_intf,
bool _bClipboard ) :
=====================================
modules/gui/qt/dialogs/plugins.cpp
=====================================
@@ -34,7 +34,7 @@
#include "util/animators.hpp"
#include "util/imagehelper.hpp"
-#include <assert.h>
+#include <cassert>
#include <vlc_modules.h>
=====================================
modules/gui/qt/dialogs/sout.cpp
=====================================
@@ -33,7 +33,7 @@
#include <QString>
-#include <assert.h>
+#include <cassert>
SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString& inputMRL )
: QWizard( parent )
=====================================
modules/gui/qt/dialogs_provider.hpp
=====================================
@@ -29,7 +29,7 @@
# include "config.h"
#endif
-#include <assert.h>
+#include <cassert>
#include "qt.hpp"
=====================================
modules/gui/qt/extensions_manager.cpp
=====================================
@@ -26,7 +26,7 @@
#include "dialogs/extensions.hpp"
#include <vlc_modules.h>
-#include "assert.h"
+#include <cassert>
#include <QMenu>
#include <QAction>
=====================================
modules/gui/qt/main_interface_win32.cpp
=====================================
@@ -35,7 +35,7 @@
#include <QBitmap>
-#include <assert.h>
+#include <cassert>
#include <QWindow>
#include <qpa/qplatformnativeinterface.h>
=====================================
modules/gui/skins2/controls/ctrl_generic.cpp
=====================================
@@ -29,7 +29,7 @@
#include "../utils/position.hpp"
#include "../utils/var_bool.hpp"
-#include <assert.h>
+#include <cassert>
CtrlGeneric::CtrlGeneric( intf_thread_t *pIntf, const UString &rHelp,
=====================================
modules/gui/skins2/src/vlcproc.cpp
=====================================
@@ -56,7 +56,7 @@
#include "../utils/var_string.hpp"
#include <sstream>
-#include <assert.h>
+#include <cassert>
VlcProc *VlcProc::instance( intf_thread_t *pIntf )
{
=====================================
modules/gui/skins2/x11/x11_window.cpp
=====================================
@@ -35,7 +35,7 @@
#include "x11_dragdrop.hpp"
#include "x11_factory.hpp"
-#include <assert.h>
+#include <cassert>
#include <limits.h>
#include <new>
@@ -334,7 +334,7 @@ void X11Window::setFullscreen( ) const
event.format = 32;
event.data.l[ 0 ] = 1;
event.data.l[ 1 ] = NET_WM_STATE_FULLSCREEN;
-
+
XSendEvent( XDISPLAY,
DefaultRootWindow( XDISPLAY ),
False, SubstructureNotifyMask|SubstructureRedirectMask,
=====================================
modules/packetizer/avparser.c
=====================================
@@ -104,7 +104,7 @@ int avparser_OpenPacketizer( vlc_object_t *p_this )
if( !p_ctx )
return VLC_EGENERIC;
- AVCodec * p_codec = avcodec_find_decoder( i_avcodec_id );
+ const AVCodec * p_codec = avcodec_find_decoder( i_avcodec_id );
if( unlikely( !p_codec ) )
{
av_parser_close( p_ctx );
=====================================
modules/services_discovery/upnp.cpp
=====================================
@@ -36,7 +36,7 @@
#include <vlc_services_discovery.h>
#include <vlc_charset.h>
-#include <assert.h>
+#include <cassert>
#include <limits.h>
#include <algorithm>
#include <set>
=====================================
modules/stream_out/chromecast/chromecast_demux.cpp
=====================================
@@ -34,7 +34,7 @@
#include "chromecast_common.h"
-#include <assert.h>
+#include <cassert>
#include <new>
static void on_paused_changed_cb(void *data, bool paused);
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/672d60bdc4694be97d195e8c15a14917ec53e1a5...b12613a80361d190660439627f75a0c965074c3d
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/672d60bdc4694be97d195e8c15a14917ec53e1a5...b12613a80361d190660439627f75a0c965074c3d
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