Merge branch 'videolan:3.0.x' into 3.0.x

Author: avently

Makefile.am

@@ -65,10 +65,9 @@ EXTRA_DIST += \
 	extras/tools/bison-macOS-7df04f9.patch \
 	extras/tools/bison-macOS-c41f233c.patch \
 	extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch \
-	extras/tools/libtool-2.4.6-bitcode.patch \
-	extras/tools/libtool-2.4.6-clang-libs.patch \
-	extras/tools/libtool-2.4.6-response-files.patch \
-	extras/tools/libtool-2.4.6-san.patch \
+	extras/tools/libtool-2.4.7-bitcode.patch \
+	extras/tools/libtool-2.4.7-clang-libs.patch \
+	extras/tools/libtool-2.4.7-response-files.patch \
 	extras/tools/ragel-6.8-javacodegen.patch
 
 ###############################################################################

NEWS

@@ -1,26 +1,130 @@
+Changes between 3.0.20 and 3.0.21:
+----------------------------------
+
+Decoders:
+ * Improve Opus ambisonic support
+ * Fix some ASS subtitle rendering issues
+ * Fix Opus in MP4 behaviour
+ * Fix VAAPI hw decoding with some drivers
+
+Input:
+ * Add support for HTTP content range handling according to RFC 9110
+ * Fix some HLS Adaptive Streaming not working in audio-only mode
+
+Video Output:
+ * Super Resolution scaling with AMD GPUs
+ * The D3D11 HDR option can also turn on/off HDR for all sources regardless of
+   the display
+ * Improve subtitles rendering on Apple platforms of notably Asian languages
+   by correcting font fallback lookups
+
+Video Filter:
+ * New AMD VQ Enhancer filter
+ * Add D3D11 option to use NVIDIA TrueHDR to generate HDR from SDR sources
+
+Audio Output:
+ * Fix regression on macOS causing crashes when using audio devices
+   with more than 9 channels
+
+Services Discovery:
+ * Fix exposed UPnP directory URL schemes to be compliant with RFC 3986
+
+Contrib:
+ * Update FFmpeg to 4.4.4
+ * Update dav1d to 1.4.2
+ * Update libvpx to 1.14.1
+
+libVLC:
+ * the HWND passed to libvlc_media_player_set_hwnd must have the WS_CLIPCHILDREN
+   style set.
+ * Fix crashes when using caopengllayer
+
+Misc:
+ * Fix various warnings, leaks and potential crashes
+ * Fix security integer overflow in MMS module
+
+
+Changes between 3.0.19 and 3.0.20:
+----------------------------------
+
+Video Output:
+ * Fix green line in fullscreen in D3D11 video output
+ * Fix crash with some AMD drivers old versions
+ * Fix events propagation issue when double-clicking with mouse wheel
+
+Decoders:
+ * Fix crash when AV1 hardware decoder fails
+
+Interface:
+ * Fix annoying disappearance of the Windows fullscreen controller
+
+Demuxers:
+ * Fix potential security issue (OOB Write) on MMS:// by checking user size bounds
+
+
 Changes between 3.0.18 and 3.0.19:
 ----------------------------------
 
+Core:
+ * Fix next-frame freezing in most scenarios
+
 Demux:
- * Fix some FLAC VBR files playback regression
- * Fix black screen on poorly edited MP4 files on Android Mediacodec
+ * Fix FLAC playback quality regression with variable frame size
+ * Support RIFF INFO tags for Wav files
  * Fix AVI files with flipped RAW video planes
  * Fix duration on short and small Ogg/Opus files
  * Fix some HLS/TS streams with ID3 prefix
+ * Fix some HLS playlist refresh drift
  * Fix for GoPro MAX spatial metadata
+ * Improve FFmpeg-muxed MP4 chapters handling
+ * Improve playback for QNap-produced AVI files
+ * Improve playback of some old RealVideo files
+ * Fix duration probing on some MP4 with missing information
+
+Decoders:
+ * Multiple fixes on AAC handling
+ * Activate hardware decoding of AV1 on Windows (DxVA)
+ * Improve AV1 HDR support with software decoding
+ * Fix some AV1 GBRP streams, AV1 super-resolution streams and monochrome ones
+ * Fix black screen on poorly edited MP4 files on Android Mediacodec
+ * Fix rawvid video in NV12
+ * Fix several issues on Windows hardware decoding (including "too large resolution in DxVA")
+ * Improve crunchyroll-produced SSA rendering
+
+Video Output:
+ * Super Resolution scaling with nVidia and Intel GPUs
+ * Fix for an issue when cropping on Direct3D9
+ * Multiple fixes for hardware decoding on D3D11 and OpenGL interop
+ * Fix an issue when playing -90°rotated video
+ * Fix subtitles rendering blur on recent macOS
+
+Input:
+ * Improve SMB compatibility with Windows 11 hosts
 
 Contribs:
  * Update of fluidlite, fixing some MIDI rendering on Windows
  * Update of zlib to 1.2.13 (CVE-2022-37434)
+ * Update of FFmpeg, vpx (CVE-2023-5217), ebml, dav1d, libass
 
 Misc:
+ * Improve muxing timestamps in a few formats (reset to 0)
  * Fix some rendering issues on Linux with the fullscreen controller
- * Fix some MPRIS inconsistencies that broke some OS widgets on Linux
+ * Fix GOOM visualization
  * Fixes for Youtube playback
- * Fix some crashes on macOS when switching application
+ * Fix some MPRIS inconsistencies that broke some OS widgets on Linux
+ * Implement MPRIS TrackList signals
+ * Fix opening files in read-only mode
  * Fix password search using the Kwallet backend
+ * Fix some crashes on macOS when switching application
  * Fix 5.1/7.1 output on macOS and tvOS
- * Multiple fixes on AAC handling
+ * Fix several crashes and bugs in the macOS preferences panel
+ * Improvements on the threading of the MMDevice audio output on Windows
+ * Fix a potential security issue on the uninstaller DLLs (CVE-2023-46814)
+ * Fix memory leaks when using the media_list_player libVLC APIs
+
+Translations:
+ * Update of most translations
+ * New translations to Esperanto, Interlingue, Lao, Macedonian, Burmese, Odia, Samoan and Swahili
 
 
 Changes between 3.0.18-rc2 and 3.0.18:

bin/breakpad.cpp

@@ -42,20 +42,23 @@ static bool FilterCallback(void*, EXCEPTION_POINTERS*, MDRawAssertionInfo*)
 extern "C"
 {
 
+#define WIDEN_(x) L ## x
+#define WIDEN(x) WIDEN_(x)
+
 void CheckCrashDump( const wchar_t* path )
 {
     wchar_t pattern[MAX_PATH];
-    WIN32_FIND_DATA data;
+    WIN32_FIND_DATAW data;
     _snwprintf( pattern, MAX_PATH, L"%s/*.dmp", path );
-    HANDLE h = FindFirstFile( pattern, &data );
+    HANDLE h = FindFirstFileW( pattern, &data );
     if (h == INVALID_HANDLE_VALUE)
         return;
-    int answer = MessageBox( NULL, L"Ooops: VLC media player just crashed.\n" \
+    int answer = MessageBoxW( NULL, L"Ooops: VLC media player just crashed.\n" \
         "Would you like to send a bug report to the developers team?",
         L"VLC crash reporting", MB_YESNO);
     std::map<std::wstring, std::wstring> params;
     params[L"prod"] = L"VLC";
-    params[L"ver"] = TEXT(PACKAGE_VERSION);
+    params[L"ver"] = WIDEN(PACKAGE_VERSION);
     do
     {
         wchar_t fullPath[MAX_PATH];
@@ -65,18 +68,18 @@ void CheckCrashDump( const wchar_t* path )
             std::map<std::wstring, std::wstring> files;
             files[L"upload_file_minidump"] = fullPath;
             google_breakpad::HTTPUpload::SendRequest(
-                            TEXT( BREAKPAD_URL "/reports" ), params, files,
+                            WIDEN( BREAKPAD_URL "/reports" ), params, files,
                             NULL, NULL, NULL );
         }
-        DeleteFile( fullPath );
-    } while ( FindNextFile( h, &data ) );
+        DeleteFileW( fullPath );
+    } while ( FindNextFileW( h, &data ) );
     FindClose(h);
 }
 
 void* InstallCrashHandler( const wchar_t* crashdump_path )
 {
     // Breakpad needs the folder to exist to generate the crashdump
-    CreateDirectory( crashdump_path, NULL );
+    CreateDirectoryW( crashdump_path, NULL );
     return new(std::nothrow) ExceptionHandler( crashdump_path, FilterCallback,
                                 NULL, NULL, ExceptionHandler::HANDLER_ALL);
 }

bin/winvlc.c

@@ -209,19 +209,28 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     argv[argc] = NULL;
     LocalFree (wargv);
 
+#ifdef HAVE_BREAKPAD
     void* eh = NULL;
     if(crash_handling)
     {
-#ifdef HAVE_BREAKPAD
-        static wchar_t path[MAX_PATH];
+        wchar_t path[MAX_PATH];
         if( S_OK != SHGetFolderPathW( NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE,
                     NULL, SHGFP_TYPE_CURRENT, path ) )
             fprintf( stderr, "Can't open the vlc conf PATH\n" );
-        _snwprintf( path+wcslen( path ), MAX_PATH,  L"%s", L"\\vlc\\crashdump" );
-        CheckCrashDump( &path[0] );
-        eh = InstallCrashHandler( &path[0] );
-#endif
+        else
+        {
+            size_t pathlen = wcslen(path);
+            if ( pathlen + 1 + wcslen(L"\\vlc\\crashdump" ) <= MAX_PATH )
+            {
+                wcscpy( &path[pathlen], L"\\vlc\\crashdump" );
+                CheckCrashDump( path );
+                eh = InstallCrashHandler( path );
+            }
+        }
     }
+#else
+    (void)crash_handling;
+#endif
 
     _setmode( _fileno( stdin ), _O_BINARY ); /* Needed for pipes */
 

configure.ac

@@ -1,11 +1,11 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT([Copyright 1999-2022 VLC authors and VideoLAN])
+AC_COPYRIGHT([Copyright 1999-2024 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 3.0.19)
+AC_INIT(vlc, 3.0.21)
 VERSION_MAJOR=3
 VERSION_MINOR=0
-VERSION_REVISION=19
+VERSION_REVISION=21
 VERSION_EXTRA=0
 VERSION_DEV=
 
@@ -14,7 +14,7 @@ AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Vetinari"
-COPYRIGHT_YEARS="1996-2022"
+COPYRIGHT_YEARS="1996-2024"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)
@@ -219,7 +219,9 @@ case "${host_os}" in
   *mingw32* | *cygwin* | *wince* | *mingwce*)
     dnl Force libtool to not link to (shared) libgcc_s when detecting C++ dependencies
     dnl When doing this test with -static-libgcc it will link on (static) libgcc_eh
-    CXXFLAGS="${CXXFLAGS} -static-libgcc"
+    AC_LANG_PUSH(C++)
+    AX_APPEND_COMPILE_FLAGS([-static-libgcc], [CXXFLAGS], [-Werror])
+    AC_LANG_POP(C++)
     AC_CHECK_TOOL(WINDRES, windres, :)
     AC_CHECK_TOOL(OBJCOPY, objcopy, :)
     AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
@@ -355,8 +357,7 @@ AC_ARG_ENABLE([pdb],
 AS_IF([test "${SYS}" = "mingw32"],[
   AS_IF([test "${enable_pdb}" = "yes"], [
     vlc_build_pdb=1
-    AX_APPEND_FLAG([-g -gcodeview],[CFLAGS])
-    AX_APPEND_FLAG([-g -gcodeview],[CXXFLAGS])
+    AX_APPEND_FLAG([-g -gcodeview],[CPPFLAGS])
     LDFLAGS="${LDFLAGS} -Wl,-pdb="
   ],[])
 ])
@@ -1824,7 +1825,7 @@ You can get an updated one from http://www.live555.com/liveMedia .])
         other_libs="$other_libs -lws2_32"
       ])
 
-      dnl We need to check for pic because live555 don't provide shared libs
+      dnl We need to check for pic because live555 do not provide shared libs
       dnl and we want to build a plugins so we need -fPIC on some arch.
       VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
       VLC_ADD_LDFLAGS([live555], [${LDFLAGS_live555}])
@@ -1941,6 +1942,31 @@ AS_IF([test "$enable_v4l2" != "no"], [
 ])
 AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"])
 
+dnl
+dnl  AMD Advanced Media Framework API
+dnl
+AC_ARG_ENABLE([amf-scaler], AS_HELP_STRING([--disable-amf-scaler],
+  [disable AMD Scaler API (default auto)]))
+have_amf_scaler="no"
+AS_IF([test "$enable_amf_scaler" != "no"], [
+  AC_CHECK_HEADERS([AMF/core/PropertyStorage.h AMF/components/HQScaler.h], [
+    have_amf_scaler="yes"
+    AC_DEFINE(HAVE_AMF_SCALER, 1, AMD HQScaler supported)
+  ])
+])
+AM_CONDITIONAL([HAVE_AMF_SCALER], [test "${have_amf_scaler}" != "no"])
+
+AC_ARG_ENABLE([amf-enhancer], AS_HELP_STRING([--disable-amf-enhancer],
+  [disable AMD Enhancer API (default auto)]))
+have_amf_enhancer="no"
+AS_IF([test "$enable_amf_enhancer" != "no"], [
+  AC_CHECK_HEADERS([AMF/core/PropertyStorage.h AMF/components/VQEnhancer.h], [
+    have_amf_enhancer="yes"
+    AC_DEFINE(HAVE_AMF_ENHANCER, 1, AMD VQ Enhancer supported)
+  ])
+])
+AM_CONDITIONAL([HAVE_AMF_ENHANCER], [test "${have_amf_enhancer}" != "no"])
+
 dnl
 dnl special access module for Blackmagic SDI cards
 dnl
@@ -3370,6 +3396,7 @@ AS_IF([test "${enable_directx}" != "no"], [
 
   dnl Direct3D11
   AC_CHECK_HEADERS(d3d11.h, [
+    AC_CHECK_TYPES([D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS],,,[#include <d3d11.h>])
     VLC_ADD_PLUGIN([direct3d11 direct3d11_filters])
   ])
 
@@ -4196,7 +4223,7 @@ AC_ARG_ENABLE(libplacebo,
       [disable libplacebo support (default auto)])])
 
 AS_IF([test "$enable_libplacebo" != "no"], [
-  PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 0.2.1], [
+  PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 0.2.1 libplacebo < 6], [
     AC_DEFINE([HAVE_LIBPLACEBO], [1], [Define to 1 if libplacebo is enabled.])
   ], [
     AS_IF([test -n "${enable_libplacebo}"], [

contrib/src/amf/0001-Differentiate-the-AMF_NO_VTABLE-based-on-the-compile.patch

@@ -0,0 +1,47 @@
+From cf190d084644d3d3e2ea1ffbb740ad8e7aede760 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <[email protected]>
+Date: Fri, 16 Feb 2024 08:18:19 +0100
+Subject: [PATCH] Differentiate the AMF_NO_VTABLE based on the compiler
+
+This is a Microsoft specific extension: https://learn.microsoft.com/en-us/cpp/cpp/novtable
+Clang and gcc can compile for Windows but don't support this.
+---
+ amf/public/include/core/Platform.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h
+index d6496d4..378f789 100644
+--- a/amf/public/include/core/Platform.h
++++ b/amf/public/include/core/Platform.h
+@@ -100,6 +100,12 @@ typedef signed int HRESULT;
+ #include <stdint.h>
+ #include <string.h>
+ 
++#if defined(_MSC_VER)
++    #define AMF_NO_VTABLE           __declspec(novtable)
++#else
++    #define AMF_NO_VTABLE
++#endif
++
+ #if defined(_WIN32)
+ 
+ 
+@@ -116,7 +122,6 @@ typedef signed int HRESULT;
+     #define AMF_INLINE              __inline
+     #define AMF_FORCEINLINE         __forceinline
+ #endif
+-    #define AMF_NO_VTABLE           __declspec(novtable)
+ 
+ #else // !WIN32 - Linux and Mac
+ 
+@@ -130,7 +135,6 @@ typedef signed int HRESULT;
+     #define AMF_INLINE              __inline__
+     #define AMF_FORCEINLINE         __inline__
+ #endif
+-    #define AMF_NO_VTABLE
+ 
+ #endif // WIN32
+ 
+-- 
+2.37.3.windows.1
+