[vlc-commits] [Git][videolan/vlc] Pushed new tag 3.0.21-1
Jean-Baptiste Kempf pushed new tag 3.0.21-1 at VideoLAN / VLC -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/tree/3.0.21-1 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc] Deleted tag 3.0.21-1
Jean-Baptiste Kempf deleted tag 3.0.21-1 at VideoLAN / VLC -- This project does not include diff previews in email notifications. You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] d3d11_tonemap: log when the TrueHDR feature is not available
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
9c476829 by Steve Lhomme at 2024-06-08T19:46:59+00:00
d3d11_tonemap: log when the TrueHDR feature is not available
That is the case for win32 builds on win64.
- - - - -
1 changed file:
- modules/video_output/win32/d3d11_tonemap.cpp
Changes:
=
modules/video_output/win32/d3d11_tonemap.cpp
=
@@ -117,6 +117,7 @@ d3d11_tonemapper *D3D11_TonemapperCreate(vlc_object_t *vd,
d3d11_device_t *d3d_d
if (!available)
{
+msg_Warn(vd, "True HDR not supported");
d3d11_device_unlock(d3d_dev);
goto error;
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/9c4768291ee0ce8e29fdadf3e05cbde2714bbe0c
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/9c4768291ee0ce8e29fdadf3e05cbde2714bbe0c
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] d3d11_scaler: always read the staging size without the decoder padding
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
ec7bd545 by Steve Lhomme at 2024-06-08T21:27:31+02:00
d3d11_scaler: always read the staging size without the decoder padding
- - - - -
1 changed file:
- modules/video_output/win32/d3d11_scaler.cpp
Changes:
=
modules/video_output/win32/d3d11_scaler.cpp
=
@@ -653,14 +653,12 @@ int D3D11_UpscalerScale(vlc_object_t *vd, d3d11_scaler
*scaleProc, picture_sys_t
auto packedStaging =
scaleProc->amfInput->GetPlane(amf::AMF_PLANE_PACKED);
ID3D11Texture2D *amfStaging = reinterpret_cast(packedStaging->GetNative());
-#ifndef NDEBUG
D3D11_TEXTURE2D_DESC stagingDesc, inputDesc;
amfStaging->GetDesc();
p_sys->texture[KNOWN_DXGI_INDEX]->GetDesc();
assert(stagingDesc.Width <= inputDesc.Width);
assert(stagingDesc.Height <= inputDesc.Height);
assert(stagingDesc.Format == inputDesc.Format);
-#endif
D3D11_BOX box = {};
box.bottom = stagingDesc.Height,
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/ec7bd545d74a7c4b4ef85ce90f9247d83f6146f6
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/ec7bd545d74a7c4b4ef85ce90f9247d83f6146f6
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: bluray: update to 1.3.4
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
f44944a5 by Steve Lhomme at 2024-06-08T14:02:52+00:00
contrib: bluray: update to 1.3.4
- - - - -
63ffd9e4 by Steve Lhomme at 2024-06-08T14:02:52+00:00
configure: require libbluray 1.1.0
Its 5 years old and contain patches for
https://code.videolan.org/videolan/libbluray/-/issues/1
- - - - -
8abb7cea by Steve Lhomme at 2024-06-08T14:02:52+00:00
access: bluray: remove hack for blacklisting
It was handled in 1.1.0 https://code.videolan.org/videolan/libbluray/-/issues/1
- - - - -
804acaed by Steve Lhomme at 2024-06-08T14:02:52+00:00
contrib: bluray: remove internal header installation
We dont use the hack anymore.
- - - - -
5 changed files:
- configure.ac
- − contrib/src/bluray/0001-install-bdjo_data-header.patch
- contrib/src/bluray/SHA512SUMS
- contrib/src/bluray/rules.mak
- modules/access/bluray.c
Changes:
=
configure.ac
=
@@ -2125,7 +2125,7 @@ PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav >= 6.0.0],
[DVD with navigation inp
dnl
dnl Blu-ray Disc Support with libbluray
dnl
-PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.6.2], (libbluray
for Blu-ray disc support ) )
+PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 1.1.0], (libbluray
for Blu-ray disc support ) )
dnl
dnl OpenCV wrapper and example filters
=
contrib/src/bluray/0001-install-bdjo_data-header.patch deleted
=
@@ -1,37 +0,0 @@
-From 73681388dfd0f839e0b4447b3063842d606691d8 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie
-Date: Mon, 19 Nov 2018 15:27:23 +0100
-Subject: [PATCH] install bdjo_data header
-
- Makefile.am| 1 +
- src/libbluray/bluray.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 94add5b..f9a76a0 100644
a/Makefile.am
-+++ b/Makefile.am
-@@ -218,6 +218,7 @@ pkginclude_HEADERS = \
- src/libbluray/bluray-version.h \
- src/libbluray/keys.h \
- src/libbluray/player_settings.h \
-+ src/libbluray/bdj/bdjo_data.h \
- src/libbluray/bdnav/clpi_data.h \
- src/libbluray/bdnav/meta_data.h \
- src/libbluray/decoders/overlay.h \
-diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
-index 8eb8100..86be9e6 100644
a/src/libbluray/bluray.h
-+++ b/src/libbluray/bluray.h
-@@ -1073,6 +1073,7 @@ void bd_free_mobj(struct mobj_objects *);
- struct bdjo_data;
- struct bdjo_data *bd_read_bdjo(const char *bdjo_file);
- void bd_free_bdjo(struct bdjo_data *);
-+#define BLURAY_HAS_BDJO_DATA_H
-
- /* BD-J testing */
-
---
-2.17.2
-
=
contrib/src/bluray/SHA512SUMS
=
@@ -1 +1 @@
-6f2d3a984809db33a99d2fe3618370a3fda3ef1c417b725d3c2e1f24ff21495f95a6a5f78b30b2b26bab47865f68dd08c08e8a554809d3a5225956da712dc064
libbluray-1.3.2.tar.bz2
+94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1
libbluray-1.3.4.tar.bz2
=
contrib/src/bluray/rules.mak
=
@@ -1,6 +1,6 @@
# LIBBLURAY
-BLURAY_VERSION := 1.3.2
+BLURAY_VERSION := 1.3.4
BLURAY_URL :=
$(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
ifdef BUILD_DISCS
@@ -48,7 +48,6 @@ $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray
$(UNPACK)
- $(APPLY) $(SRC)/bluray/0001-install-bdjo_data-header.patch
$(call pkg_static,"src/libbluray.pc.in")
$(MOVE)
=
modules/access/bluray.c
=
@@ -131,80 +131,6 @@ static const char * bluray_event_debug_strings[] =
# define blurayDebugEvent(e, v)
#endif
-#ifdef BLURAY_HAS_BDJO_DATA_H
-/* System version check menu freeze. See
- * https://code.videolan.org/videolan/libbluray/issues/1
- * To be removed with fix[ed,able] libbluray */
-# include
-# include
-static int BDJO_FileSelect( const char *psz_filename )
-{
-int i_len = strlen( psz_filename );
-if ( i_len <= 5 )
-return 0;
-else
-return ! strcasecmp( _filename[i_len - 5], ".bdjo" );
-}
-
-static bool BDJO_IsBlacklisted(demux_t *p_demux, const char *psz_bd_path)
-{
-const char * rgsz_class_blacklist[] =
-{
-"com.macrovision.bdplus.Handshake",
-};
-
-bool b_ret = false;
-char *psz_bdjo_dir;
-if(-1 == asprintf(_bdjo_dir, "%s/BDMV/BDJO", psz_bd_path))
-return false;
-
-char **ppsz_filenames = NULL;
-int i_files = vlc_scandir(psz_bdjo_dir, _filenames, BDJO_FileSelect,
NULL);
-if(i_files < 1)
-{
-free(psz_bdjo_dir);
-return false;
-}
-
-for( int i=0; iapp_table.num_app && !b_ret; j++)
-for(;
[vlc-commits] [Git][videolan/vlc] Pushed new tag 3.0.21-1
Jean-Baptiste Kempf pushed new tag 3.0.21-1 at VideoLAN / VLC -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/tree/3.0.21-1 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: freetype/win32: fix bogus string cast
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
947e2453 by Steve Lhomme at 2024-06-08T13:22:37+00:00
freetype/win32: fix bogus string cast
lfFaceName is a WCHAR table.
(cherry picked from commit f4d040e050a1c0c484d8334442c7a93c5c809df4) (edited)
edited:
- 3.0 uses the tchar API
Signed-off-by: Steve Lhomme rob...@ycbcr.xyz
- - - - -
ed469a13 by Steve Lhomme at 2024-06-08T13:22:37+00:00
freetype/win32: fix string constant when using WCHAR/wchar_t APIs
explicitely
wcscat_s is part of msvcrt.dll so should be in Windows XP.
(cherry picked from commit ab501d6a93f25064adf17456340f9ab965855571) (edited)
edited:
- 3.0 was already using a long constant
Signed-off-by: Steve Lhomme rob...@ycbcr.xyz
- - - - -
1 changed file:
- modules/text_renderer/freetype/fonts/win32.c
Changes:
=
modules/text_renderer/freetype/fonts/win32.c
=
@@ -170,7 +170,7 @@ static char* GetWindowsFontPath()
if( S_OK != SHGetFolderPathW( NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT,
wdir ) )
{
GetWindowsDirectoryW( wdir, MAX_PATH );
-wcscat( wdir, L"\\fonts" );
+wcscat_s( wdir, MAX_PATH, L"\\fonts" );
}
return FromWide( wdir );
}
@@ -422,7 +422,7 @@ const vlc_family_t *Win32_GetFamily( filter_t *p_filter,
const char *psz_family
lf.lfCharSet = DEFAULT_CHARSET;
LPTSTR psz_fbuffer = ToT( psz_family );
-_tcsncpy( (LPTSTR), psz_fbuffer, LF_FACESIZE );
+_tcsncpy( lf.lfFaceName, psz_fbuffer, ARRAY_SIZE(lf.lfFaceName) );
free( psz_fbuffer );
/* */
@@ -477,7 +477,7 @@ static char *UniscribeFallback( const char *psz_family,
uni_char_t codepoint )
psz_fbuffer = ToT( psz_family );
if( !psz_fbuffer )
goto error;
-_tcsncpy( ( LPTSTR ) , psz_fbuffer, LF_FACESIZE );
+_tcsncpy( lf.lfFaceName, psz_fbuffer, ARRAY_SIZE(lf.lfFaceName) );
free( psz_fbuffer );
lf.lfCharSet = DEFAULT_CHARSET;
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/4071ece4bbfc860ea0793aed8589db6bb1329f32...ed469a1388bf482cd8febf5fe7d2c47dd7ea68c2
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/4071ece4bbfc860ea0793aed8589db6bb1329f32...ed469a1388bf482cd8febf5fe7d2c47dd7ea68c2
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: d3d11_scaler: fix AMD super scaler if the source has padding
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
97d162d5 by Steve Lhomme at 2024-06-08T13:00:12+00:00
d3d11_scaler: fix AMD super scaler if the source has padding
It asserts in debug build and will keep the padding in release mode.
- - - - -
4071ece4 by Steve Lhomme at 2024-06-08T13:00:12+00:00
d3d11_scaler: fix missing picture sys for AMD super scaler
This code is different from 4.0, must have been lost in a rebase.
- - - - -
1 changed file:
- modules/video_output/win32/d3d11_scaler.cpp
Changes:
=
modules/video_output/win32/d3d11_scaler.cpp
=
@@ -657,11 +657,16 @@ int D3D11_UpscalerScale(vlc_object_t *vd, d3d11_scaler
*scaleProc, picture_sys_t
D3D11_TEXTURE2D_DESC stagingDesc, inputDesc;
amfStaging->GetDesc();
p_sys->texture[KNOWN_DXGI_INDEX]->GetDesc();
-assert(stagingDesc.Width == inputDesc.Width);
-assert(stagingDesc.Height == inputDesc.Height);
+assert(stagingDesc.Width <= inputDesc.Width);
+assert(stagingDesc.Height <= inputDesc.Height);
assert(stagingDesc.Format == inputDesc.Format);
#endif
+D3D11_BOX box = {};
+box.bottom = stagingDesc.Height,
+box.right = stagingDesc.Width,
+box.back = 1,
+
// copy source into staging as it may not be shared
d3d11_device_lock( scaleProc->d3d_dev );
scaleProc->d3d_dev->d3dcontext->CopySubresourceRegion(amfStaging,
@@ -669,7 +674,7 @@ int D3D11_UpscalerScale(vlc_object_t *vd, d3d11_scaler
*scaleProc, picture_sys_t
0, 0, 0,
p_sys->texture[KNOWN_DXGI_INDEX],
p_sys->slice_index,
-NULL);
+);
d3d11_device_unlock( scaleProc->d3d_dev );
submitSurface = scaleProc->amfInput;
@@ -719,6 +724,19 @@ int D3D11_UpscalerScale(vlc_object_t *vd, d3d11_scaler
*scaleProc, picture_sys_t
return (-ENOTSUP);
}
+if (scaleProc->picsys.processorInput)
+{
+scaleProc->picsys.processorInput->Release();
+scaleProc->picsys.processorInput = NULL;
+}
+if (scaleProc->picsys.processorOutput)
+{
+scaleProc->picsys.processorOutput->Release();
+scaleProc->picsys.processorOutput = NULL;
+}
+scaleProc->picsys.texture[0] = out;
+scaleProc->picsys.formatTexture = inputDesc.Format;
+
amfOutput->Release();
return VLC_SUCCESS;
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/d587ae967ad6fc5a93c127b7263c179224e75cdc...4071ece4bbfc860ea0793aed8589db6bb1329f32
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/d587ae967ad6fc5a93c127b7263c179224e75cdc...4071ece4bbfc860ea0793aed8589db6bb1329f32
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 3 commits: qt: move the dcomp check in CompositorDirectComposition::init()
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
1e43b9ee by Steve Lhomme at 2024-06-08T14:46:20+02:00
qt: move the dcomp check in CompositorDirectComposition::init()
We can refuse to initialize from here. It will try the next in the
compositorList list.
- - - - -
f6df83c0 by Steve Lhomme at 2024-06-08T14:46:20+02:00
qt: remove preInit() that always returns true
- - - - -
7c212192 by Steve Lhomme at 2024-06-08T14:46:39+02:00
qt: check the qt platform matches before checking for dcomp
- - - - -
13 changed files:
- modules/gui/qt/maininterface/compositor.cpp
- modules/gui/qt/maininterface/compositor.hpp
- modules/gui/qt/maininterface/compositor_dcomp.cpp
- modules/gui/qt/maininterface/compositor_dcomp.hpp
- modules/gui/qt/maininterface/compositor_dummy.cpp
- modules/gui/qt/maininterface/compositor_dummy.hpp
- modules/gui/qt/maininterface/compositor_wayland.cpp
- modules/gui/qt/maininterface/compositor_wayland.hpp
- modules/gui/qt/maininterface/compositor_win7.cpp
- modules/gui/qt/maininterface/compositor_win7.hpp
- modules/gui/qt/maininterface/compositor_x11.cpp
- modules/gui/qt/maininterface/compositor_x11.hpp
- modules/gui/qt/qt.cpp
Changes:
=
modules/gui/qt/maininterface/compositor.cpp
=
@@ -53,29 +53,23 @@ static Compositor* instanciateCompositor(qt_intf_t *p_intf)
{
return new T(p_intf);
}
-template
-static bool preInit(qt_intf_t *p_intf) {
-return T::preInit(p_intf);
-}
-
struct {
const char* name;
Compositor* (*instantiate)(qt_intf_t *p_intf);
-bool (*preInit)(qt_intf_t *p_intf);
} static compositorList[] = {
#ifdef _WIN32
#ifdef HAVE_DCOMP_H
-{"dcomp", ,
},
+{"dcomp", },
#endif
-{"win7", ,
},
+{"win7", },
#endif
#ifdef QT_HAS_WAYLAND_COMPOSITOR
-{"wayland", ,
},
+{"wayland", },
#endif
#ifdef QT_HAS_X11_COMPOSITOR
-{"x11", , },
+{"x11", },
#endif
-{"dummy", ,
}
+{"dummy", }
};
CompositorFactory::CompositorFactory(qt_intf_t *p_intf, const char* compositor)
@@ -84,19 +78,6 @@ CompositorFactory::CompositorFactory(qt_intf_t *p_intf,
const char* compositor)
{
}
-bool CompositorFactory::preInit()
-{
-for (; m_compositorIndex < ARRAY_SIZE(compositorList); m_compositorIndex++)
-{
-if (m_compositorName == "auto" || m_compositorName ==
compositorList[m_compositorIndex].name)
-{
-if (compositorList[m_compositorIndex].preInit(m_intf))
-return true;
-}
-}
-return false;
-}
-
Compositor* CompositorFactory::createCompositor()
{
for (; m_compositorIndex < ARRAY_SIZE(compositorList); m_compositorIndex++)
=
modules/gui/qt/maininterface/compositor.hpp
=
@@ -173,9 +173,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(CompositorVideo::Flags)
*
* the usual scenario is:
*
- * - call to preInit that will try to preInit compositors from list until we
find
- * a matching candidate
- *
* - start Qt main loop
*
* - call to createCompositor to instantiate the compositor, if it fails it
will
@@ -186,18 +183,6 @@ public:
CompositorFactory(qt_intf_t *p_intf, const char* compositor = "auto");
-/**
- * @brief preInit will check whether a compositor can be used, before
starting Qt,
- * each candidate may perform some basic checks and can setup Qt
environment variable if required
- *
- * @note if a compositor return true on preinit but fails to initialize
afterwards, next
- * compositor in chain will be initialized without the preinit phaze (as
Qt will be already started)
- * this might lead to an unstable configuration if incompatible operations
are done in the preInit phase
- *
- * @return true if a compositor can be instantiated
- */
-bool preInit();
-
/**
* @brief createCompositor will instantiate a compositor
*
=
modules/gui/qt/maininterface/compositor_dcomp.cpp
=
@@ -109,13 +109,19 @@
CompositorDirectComposition::~CompositorDirectComposition()
destroyMainInterface();
}
-bool CompositorDirectComposition::preInit(qt_intf_t *intf)
+bool CompositorDirectComposition::init()
{
#if !defined(QRhiD3D11_ACTIVE) && !defined(QRhiD3D12_ACTIVE)
-msg_Warn(intf, "compositor_dcomp was not built with D3D11 or D3D12
headers. It will not work.");
+msg_Warn(m_intf, "compositor_dcomp was not built with D3D11 or D3D12
headers. It will not work.");
return false;
#endif
+{
+const QString& platformName = qApp->platformName();
+if (!(platformName == QLatin1String("windows") || platformName ==
QLatin1String("direct2d")))
+return false;
+}
+
QSystemLibrary dcomplib(QLatin1String("dcomp"));
typedef HRESULT (__stdcall *DCompositionCreateDeviceFuncPtr)(
@@ -128,24 +134,13 @@ bool
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: d3d11_fmt: create texture for decoders or not
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
317dc63b by Steve Lhomme at 2024-06-08T10:33:36+02:00
d3d11_fmt: create texture for decoders or not
In HDR to SDR the texture staging texture cannot be allocated as a decoder
texture.
RDG10A2 is not supported for decoding.
- - - - -
d587ae96 by Steve Lhomme at 2024-06-08T10:34:32+02:00
d3d11_fmt: remove unused variable
Since 380dee8053ef69220707aed10b57113b64e0a925
- - - - -
4 changed files:
- modules/hw/d3d11/d3d11_deinterlace.c
- modules/video_chroma/d3d11_fmt.c
- modules/video_chroma/d3d11_fmt.h
- modules/video_output/win32/direct3d11.c
Changes:
=
modules/hw/d3d11/d3d11_deinterlace.c
=
@@ -307,7 +307,7 @@ static picture_t *NewOutputPicture( filter_t *p_filter )
fmt.i_width = dstDesc.Width;
fmt.i_height = dstDesc.Height;
if (AllocateTextures(p_filter, _filter->p_sys->d3d_dev, cfg,
- , 1, pic->p_sys->texture) != VLC_SUCCESS)
+ , false, 1, pic->p_sys->texture) !=
VLC_SUCCESS)
{
free(pic->p_sys);
return NULL;
=
modules/video_chroma/d3d11_fmt.c
=
@@ -147,7 +147,6 @@ int D3D11_AllocateShaderView(vlc_object_t *obj,
ID3D11Device *d3ddevice,
static HKEY GetAdapterRegistry(vlc_object_t *obj, DXGI_ADAPTER_DESC
*adapterDesc)
{
HKEY hDisplayKey, hKey;
-CHAR key[128];
CHAR szData[256], lookup[256];
DWORD len = 256;
LSTATUS ret;
@@ -570,7 +569,7 @@ const d3d_format_t *FindD3D11Format(vlc_object_t *o,
#undef AllocateTextures
int AllocateTextures( vlc_object_t *obj, d3d11_device_t *d3d_dev,
- const d3d_format_t *cfg, const video_format_t *fmt,
+ const d3d_format_t *cfg, const video_format_t *fmt, bool
for_decoder,
unsigned pool_size, ID3D11Texture2D *textures[] )
{
plane_t planes[PICTURE_PLANE_MAX];
@@ -584,7 +583,8 @@ int AllocateTextures( vlc_object_t *obj, d3d11_device_t
*d3d_dev,
texDesc.MiscFlags = 0; //D3D11_RESOURCE_MISC_SHARED;
texDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
if (is_d3d11_opaque(fmt->i_chroma)) {
-texDesc.BindFlags |= D3D11_BIND_DECODER;
+if (for_decoder)
+texDesc.BindFlags |= D3D11_BIND_DECODER;
texDesc.Usage = D3D11_USAGE_DEFAULT;
texDesc.CPUAccessFlags = 0;
} else {
=
modules/video_chroma/d3d11_fmt.h
=
@@ -159,8 +159,8 @@ static inline const d3d_format_t
*D3D11_RenderFormat(DXGI_FORMAT opaque, bool gp
}
int AllocateTextures(vlc_object_t *, d3d11_device_t *, const d3d_format_t *,
- const video_format_t *, unsigned pool_size,
ID3D11Texture2D *textures[]);
-#define AllocateTextures(a,b,c,d,e,f)
AllocateTextures(VLC_OBJECT(a),b,c,d,e,f)
+ const video_format_t *, bool, unsigned pool_size,
ID3D11Texture2D *textures[]);
+#define AllocateTextures(a,b,c,d,e,f,g)
AllocateTextures(VLC_OBJECT(a),b,c,d,e,f,g)
#ifndef NDEBUG
void D3D11_LogProcessorSupport(vlc_object_t*, ID3D11VideoProcessorEnumerator*);
=
modules/video_output/win32/direct3d11.c
=
@@ -435,7 +435,7 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned
pool_size)
/* only provide enough for the filters, we can still do direct
rendering */
slices = __MIN(slices, 6);
-if (AllocateTextures(vd, >d3d_dev, sys->pool_d3dfmt,
>pool_fmt, slices, textures))
+if (AllocateTextures(vd, >d3d_dev, sys->pool_d3dfmt,
>pool_fmt, true, slices, textures))
goto error;
pictures = calloc(pool_size, sizeof(*pictures));
@@ -1897,7 +1897,7 @@ static int Direct3D11CreateFormatResources(vout_display_t
*vd, const video_forma
surface_fmt.i_width = sys->picQuad.i_width;
surface_fmt.i_height = sys->picQuad.i_height;
-if (AllocateTextures(vd, >d3d_dev, sys->picQuad.formatInfo,
_fmt, 1, textures))
+if (AllocateTextures(vd, >d3d_dev, sys->picQuad.formatInfo,
_fmt, false, 1, textures))
{
msg_Err(vd, "Failed to allocate the staging texture");
return VLC_EGENERIC;
@@ -2240,7 +2240,7 @@ static int Direct3D11MapSubpicture(vout_display_t *vd,
int *subpicture_region_co
if (unlikely(d3dquad==NULL)) {
continue;
}
-if (AllocateTextures(vd, >d3d_dev, sys->d3dregion_format,
>p_picture->format, 1, d3dquad->picSys.texture)) {
+if (AllocateTextures(vd, >d3d_dev, sys->d3dregion_format,
>p_picture->format, false, 1, d3dquad->picSys.texture)) {
msg_Err(vd, "Failed to allocate %dx%d texture for OSD",
[vlc-commits] [Git][videolan/vlc][master] contrib: sidplay: Do not overwrite CXXFLAGS in configure.in
Steve Lhomme pushed to branch master at VideoLAN / VLC Commits: d812b753 by David Fuhrmann at 2024-06-08T09:08:49+00:00 contrib: sidplay: Do not overwrite CXXFLAGS in configure.in resid configure has a bug which overwrites CXXFLAGS unconditionally, causing build failures when preset CXXFLAGS are needed. Reason: In newer autoconf, ac_test_CXXFLAGS does not use set anymore, but y. - - - - - 2 changed files: - contrib/src/sidplay2/rules.mak - + contrib/src/sidplay2/sidplay2-cxxtest.patch Changes: = contrib/src/sidplay2/rules.mak = @@ -27,6 +27,7 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2 $(APPLY) $(SRC)/sidplay2/sidplay2-resid-dependency.patch $(APPLY) $(SRC)/sidplay2/sidplay2-char-cast.patch $(APPLY) $(SRC)/sidplay2/sidplay2-fix-overflow.patch + $(APPLY) $(SRC)/sidplay2/sidplay2-cxxtest.patch $(MOVE) .sidplay2: sidplay-libs = contrib/src/sidplay2/sidplay2-cxxtest.patch = @@ -0,0 +1,11 @@ +--- sidplay-libs/resid/configure.in.old2024-06-06 09:31:47.0 +0200 sidplay-libs/resid/configure.in2024-06-06 09:32:10.0 +0200 +@@ -28,7 +28,7 @@ + + dnl Set CXXFLAGS for g++. Use -fno-exceptions if supported. + if test "$GXX" = yes; then +- if test "$ac_test_CXXFLAGS" != set; then ++ if test "$ac_test_CXXFLAGS" != set -a "$ac_test_CXXFLAGS" != y; then + CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer -fno-exceptions" + AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works]) + AC_TRY_COMPILE([], View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d812b75331506a99b4a7a807037097752f2a78be -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d812b75331506a99b4a7a807037097752f2a78be You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt: add missing qt module opengl on linux to qt6.pro
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
b73205bb by Fatih Uzunoglu at 2024-06-08T08:35:43+00:00
qt: add missing qt module opengl on linux to qt6.pro
We directly use Qt OpenGL in compositor_x11.
- - - - -
98cb3ad1 by Fatih Uzunoglu at 2024-06-08T08:35:43+00:00
qt: remove unnecessary comments in qt6.pro
- - - - -
1 changed file:
- modules/gui/qt/qt6.pro
Changes:
=
modules/gui/qt/qt6.pro
=
@@ -12,12 +12,10 @@ QTPLUGIN += qwindows qmodernwindowsstyle
}
linux {
+QT += opengl # compositor_x11 requires Qt OpenGL
QTPLUGIN += qxcb-glx-integration qxcb-egl-integration qxcb qwayland-generic
qwayland-egl qgtk3 qxdgdesktopportal xdg-shell
}
macx {
QTPLUGIN += qcocoa qmacstyle
}
-
-# These are not needed now, but may be required in the future:
-# CONFIG += import_plugins staticlib create_pc create_prl no_install_prl
link_prl
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/691016b84e3f918f8ab15b20dfb3a8af1251b839...98cb3ad1353d297f7c69c7326d00798afea8a9ed
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/691016b84e3f918f8ab15b20dfb3a8af1251b839...98cb3ad1353d297f7c69c7326d00798afea8a9ed
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
