[vlc-commits] [Git][videolan/vlc][master] avcodec/chroma: map VLC_CODEC_VUYA to AV_PIX_FMT_VUYX
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
60c58cee by Steve Lhomme at 2024-04-28T22:57:41+00:00
avcodec/chroma: map VLC_CODEC_VUYA to AV_PIX_FMT_VUYX
It is (at least) part of FFmpeg 6.1 and can be used as DXVA/QSV output.
- - - - -
1 changed file:
- modules/codec/avcodec/chroma.c
Changes:
=
modules/codec/avcodec/chroma.c
=
@@ -121,6 +121,10 @@ static const struct
{VLC_CODEC_UYVY, AV_PIX_FMT_UYVY422, COLOR_RANGE_UNDEF },
{VLC_CODEC_YVYU, AV_PIX_FMT_YVYU422, COLOR_RANGE_UNDEF },
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 34, 100)
+{VLC_CODEC_VUYA, AV_PIX_FMT_VUYX, COLOR_RANGE_UNDEF },
+#endif
+
/* Packed RGB formats */
{VLC_CODEC_RGB233, AV_PIX_FMT_RGB8, COLOR_RANGE_UNDEF },
{VLC_CODEC_BGR233, AV_PIX_FMT_BGR8, COLOR_RANGE_UNDEF },
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/60c58cee7707d5ac7617b833e4c2bd2b628de6f9
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/60c58cee7707d5ac7617b833e4c2bd2b628de6f9
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] 7 commits: qt: update to Qt 6.7.0
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Commits: 42fa6221 by Fatih Uzunoglu at 2024-04-28T19:10:37+00:00 qt: update to Qt 6.7.0 - - - - - 8ef5c090 by Fatih Uzunoglu at 2024-04-28T19:10:37+00:00 contrib: qtbase: use the version variable for pkg check - - - - - 2ed0758b by Fatih Uzunoglu at 2024-04-28T19:10:37+00:00 contrib: qtsvg: use the version variable for pkg check - - - - - fbda9ec9 by Fatih Uzunoglu at 2024-04-28T19:10:37+00:00 contrib: qtshadertools: use the version variable for pkg check - - - - - 15a1c018 by Fatih Uzunoglu at 2024-04-28T19:10:37+00:00 contrib: qtdeclarative: use the version variable for pkg check - - - - - 5475eab5 by Fatih Uzunoglu at 2024-04-28T19:10:37+00:00 contrib: qt5compat: use the version variable for pkg check - - - - - 9cbc2ff2 by Fatih Uzunoglu at 2024-04-28T19:10:37+00:00 contrib: update to Qt 6.7.0 - - - - - 30 changed files: - − contrib/src/qt/0001-CMake-Place-resources-into-static-libraries-not-obje.patch - − contrib/src/qt/0001-QTypeInfo-Add-a-missing-include.patch - contrib/src/qt/0002-Windows-Tray-Icon-Set-NOSOUND.patch → contrib/src/qt/0001-Windows-Tray-Icon-Set-NOSOUND.patch - − contrib/src/qt/0002-QStringTokenizer-Add-a-missing-include.patch - contrib/src/qt/0003-Try-to-generate-pkgconfig-pc-files-in-static-build.patch → contrib/src/qt/0002-Try-to-generate-pkgconfig-pc-files-in-static-build.patch - − contrib/src/qt/0003-CMake-Fix-a-misplaced-in-pkg-config-files.patch - contrib/src/qt/0004-Revert-QMutex-remove-qmutex_win.cpp.patch → contrib/src/qt/0003-Revert-QMutex-remove-qmutex_win.cpp.patch - contrib/src/qt/0005-Expose-QRhiImplementation-in-QRhi.patch → contrib/src/qt/0004-Expose-QRhiImplementation-in-QRhi.patch - contrib/src/qt/0006-Do-not-include-D3D12MemAlloc.h-in-header-file.patch → contrib/src/qt/0005-Do-not-include-D3D12MemAlloc.h-in-header-file.patch - contrib/src/qt/0007-Try-DCompositionCreateDevice3-first-if-available.patch → contrib/src/qt/0006-Try-DCompositionCreateDevice3-first-if-available.patch - contrib/src/qt/0008-Try-to-satisfy-Windows-7-compatibility.patch → contrib/src/qt/0007-Try-to-satisfy-Windows-7-compatibility.patch - contrib/src/qt/SHA512SUMS - contrib/src/qt/rules.mak - contrib/src/qt5compat/SHA512SUMS - contrib/src/qt5compat/rules.mak - contrib/src/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch - + contrib/src/qtdeclarative/0002-Fix-build-with-no-feature-network.patch - contrib/src/qtdeclarative/SHA512SUMS - contrib/src/qtdeclarative/rules.mak - − contrib/src/qtshadertools/0001-Backport-a-change-to-SPIRV-Cross-to-add-a-missing-in.patch - contrib/src/qtshadertools/SHA512SUMS - contrib/src/qtshadertools/rules.mak - contrib/src/qtsvg/SHA512SUMS - contrib/src/qtsvg/rules.mak - contrib/src/qtvlcdeps/vlcdeps.pro - contrib/src/qtwayland/SHA512SUMS - contrib/src/qtwayland/rules.mak - modules/gui/qt/maininterface/compositor_dcomp.cpp - modules/gui/qt/maininterface/interface_window_handler.cpp - modules/gui/qt/player/player_controller_p.hpp The diff was not included because it is too large. View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7e8511d2a5bb323e4cd25666b638a4cb1c1b887b...9cbc2ff25e53d1027f1e1f48041cf965699c5a32 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7e8511d2a5bb323e4cd25666b638a4cb1c1b887b...9cbc2ff25e53d1027f1e1f48041cf965699c5a32 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] 12 commits: qml: rename MLModel as MLBaseModel on QML side
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Commits: a45e28b3 by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: rename MLModel as MLBaseModel on QML side So C++ and QML naming matches - - - - - 8f13fb46 by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: register BaseModel as a Qml type - - - - - a489fab7 by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: pass initial value of CSDMouseStealer on creation - - - - - 983fef0b by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: remove unused property from MusicArtistDelegate - - - - - d601d6a9 by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: enforce required properties - - - - - fe30d6bd by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: mark modelData as required in repeater using it some views won't load properly otherwise - - - - - 93ffb7e1 by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: remove accessing unexisting property in ButtonExt - - - - - dfe5d8fa by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: introduce TableRowDelegate and TableHeaderDelegate This will serve as base classes for specialized row/header implementation, the main purpose is to declare all property set by TableView - - - - - 3cc71ffc by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: inherit from TableRowDelegate and TableHeaderDelegate - - - - - 5e9df6bf by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: load manually table row and header delegate Qml Loader is unable to pass the initial properties of an Item use onComplete/onDestroyed to manually handle the items - - - - - d289e151 by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: mark properties as required in TableRowDelegate and TableHeaderDelegate - - - - - 7e8511d2 by Pierre Lamot at 2024-04-28T16:33:03+00:00 qml: require properties in TableViewDelegate - - - - - 30 changed files: - modules/gui/qt/Makefile.am - modules/gui/qt/maininterface/mainui.cpp - modules/gui/qt/maininterface/qml/MainInterface.qml - modules/gui/qt/maininterface/qml/MainViewLoader.qml - modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml - modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml - modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml - modules/gui/qt/medialibrary/qml/UrlListDisplay.qml - modules/gui/qt/medialibrary/qml/VideoAll.qml - modules/gui/qt/medialibrary/qml/VideoGridDisplay.qml - modules/gui/qt/network/qml/BrowseDeviceView.qml - modules/gui/qt/network/qml/BrowseDisplay.qml - modules/gui/qt/network/qml/BrowseTreeDisplay.qml - modules/gui/qt/network/qml/BrowseTreeHeader.qml - modules/gui/qt/network/qml/NetworkThumbnailItem.qml - modules/gui/qt/player/qml/ControlLayout.qml - modules/gui/qt/player/qml/TopBar.qml - modules/gui/qt/player/qml/TracksListPage.qml - modules/gui/qt/player/qml/TracksPage.qml - modules/gui/qt/util/qml/MLContextMenu.qml - modules/gui/qt/vlc.qrc - modules/gui/qt/widgets/qml/BannerCone.qml - modules/gui/qt/widgets/qml/ButtonExt.qml - modules/gui/qt/widgets/qml/CSDMouseStealer.qml - modules/gui/qt/widgets/qml/CSDThemeButtonSet.qml - modules/gui/qt/widgets/qml/CSDWindowButtonSet.qml - modules/gui/qt/widgets/qml/DragItem.qml - modules/gui/qt/widgets/qml/FadingEdgeForListView.qml - modules/gui/qt/widgets/qml/IconToolButton.qml - modules/gui/qt/widgets/qml/KeyNavigableTableView.qml The diff was not included because it is too large. View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fd149a38383118d5cb421fc074fded3ad1c6e443...7e8511d2a5bb323e4cd25666b638a4cb1c1b887b -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fd149a38383118d5cb421fc074fded3ad1c6e443...7e8511d2a5bb323e4cd25666b638a4cb1c1b887b 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] audio_output: don't inherit equalizer parameters if the equalizer module is not found
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
fd149a38 by Steve Lhomme at 2024-04-28T16:11:37+00:00
audio_output: don't inherit equalizer parameters if the equalizer module is
not found
- - - - -
1 changed file:
- src/audio_output/output.c
Changes:
=
src/audio_output/output.c
=
@@ -390,9 +390,10 @@ audio_output_t *aout_New (vlc_object_t *parent)
var_Change(aout, "mix-mode", VLC_VAR_SETTEXT, _("Audio mix mode"));
/* Equalizer */
-var_Create (aout, "equalizer-preamp", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
-var_Create (aout, "equalizer-bands", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
-var_Create (aout, "equalizer-preset", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+int doinherit = module_exists("equalizer") ? VLC_VAR_DOINHERIT : 0;
+var_Create (aout, "equalizer-preamp", VLC_VAR_FLOAT | doinherit);
+var_Create (aout, "equalizer-bands", VLC_VAR_STRING | doinherit);
+var_Create (aout, "equalizer-preset", VLC_VAR_STRING | doinherit);
owner->bitexact = var_InheritBool (aout, "audio-bitexact");
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/fd149a38383118d5cb421fc074fded3ad1c6e443
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/fd149a38383118d5cb421fc074fded3ad1c6e443
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] 7 commits: qml: use templates as base for combobox
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
e259c039 by Prince Gupta at 2024-04-28T15:29:15+00:00
qml: use templates as base for combobox
- - - - -
665d8cfd by Prince Gupta at 2024-04-28T15:29:15+00:00
qml: use IconLabel for indicator in ComboBox
- - - - -
ff6de187 by Prince Gupta at 2024-04-28T15:29:15+00:00
qml: use appropriate type for label
- - - - -
ad31b9ec by Prince Gupta at 2024-04-28T15:29:15+00:00
qml: use templated ItemDelegate
- - - - -
7cfee7ff by Prince Gupta at 2024-04-28T15:29:15+00:00
qml: use default implicitHeight
- - - - -
ca78bab0 by Prince Gupta at 2024-04-28T15:29:15+00:00
qml: update background for ComboBox
- - - - -
03fd36d7 by Prince Gupta at 2024-04-28T15:29:15+00:00
qml: fix size assignment for combobox in PlaybackSpeed
RowLayout doesn't follow width/height property of children
- - - - -
2 changed files:
- modules/gui/qt/player/qml/PlaybackSpeed.qml
- modules/gui/qt/widgets/qml/ComboBoxExt.qml
Changes:
=
modules/gui/qt/player/qml/PlaybackSpeed.qml
=
@@ -283,8 +283,8 @@ ColumnLayout {
Widgets.ComboBoxExt {
id: comboBox
-width: VLCStyle.combobox_width_normal
-height: VLCStyle.combobox_height_normal
+Layout.preferredWidth: VLCStyle.combobox_width_normal
+Layout.preferredHeight: VLCStyle.combobox_height_normal
model: ListModel {}
=
modules/gui/qt/widgets/qml/ComboBoxExt.qml
=
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301,
USA.
*/
import QtQuick
+import QtQuick.Templates as T
import QtQuick.Controls
import org.videolan.vlc 0.1
@@ -23,11 +24,17 @@ import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///widgets/" as Widgets
-ComboBox {
+T.ComboBox {
id: control
+implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+implicitContentWidth + spacing +
implicitIndicatorWidth + leftPadding + rightPadding)
+implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ implicitContentHeight + topPadding +
bottomPadding,
+ implicitIndicatorHeight + topPadding +
bottomPadding)
+
+padding: VLCStyle.margin_xxsmall
font.pixelSize: VLCStyle.fontSize_large
-leftPadding: 5
readonly property ColorContext colorContext: ColorContext {
id: theme
@@ -46,65 +53,46 @@ ComboBox {
Keys.priority: Keys.AfterItem
Keys.onPressed: (event) => Navigation.defaultKeyAction(event)
-delegate: ItemDelegate {
+delegate: T.ItemDelegate {
width: control.width
+height: implicitContentHeight + topPadding + bottomPadding
+padding: VLCStyle.margin_xsmall
leftPadding: control.leftPadding
-background: Item {}
-contentItem: Text {
+contentItem: Widgets.ListLabel {
text: control.textRole ? (Array.isArray(control.model) ?
modelData[control.textRole] : model[control.textRole]) : modelData
color: control.color
-font: control.font
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
}
highlighted: control.highlightedIndex === index
}
-indicator: Canvas {
-id: canvas
-x: control.width - width - control.rightPadding
+indicator: Widgets.IconLabel {
+x: control.width - width - rightPadding
y: control.topPadding + (control.availableHeight - height) / 2
-width: 10
-height: 6
-contextType: "2d"
-
-Connections {
-target: control
-function onPressedChanged() { canvas.requestPaint() }
-}
-
-onPaint: {
-if (context === null)
-return
-
-context.reset();
-context.moveTo(0, 0);
-context.lineTo(width, 0);
-context.lineTo(width / 2, height);
-context.closePath();
-context.fillStyle = control.activeFocus ? theme.accent :
control.color;
-context.fill();
-}
+font.pixelSize: VLCStyle.icon_normal
+font.bold: true
+text: VLCIcons.expand
+color: control.color
+verticalAlignment: Text.AlignVCenter
+horizontalAlignment: Text.AlignHCenter
}
-contentItem: Text {
-leftPadding: 5
-rightPadding: control.indicator.width + control.spacing
+contentItem: Widgets.ListLabel {
+rightPadding: control.spacing + control.indicator.width
text: control.displayText
-font: control.font
color: control.color
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
[vlc-commits] [Git][videolan/vlc][master] 2 commits: libplacebo: fix mismatching list of filter values/names
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
4b3b7715 by Steve Lhomme at 2024-04-28T14:45:45+00:00
libplacebo: fix mismatching list of filter values/names
- - - - -
3f421955 by Steve Lhomme at 2024-04-28T14:45:45+00:00
srt: share the SRT key length names like the key length values
- - - - -
3 changed files:
- modules/access/srt_common.c
- modules/access/srt_common.h
- modules/video_output/libplacebo/utils.h
Changes:
=
modules/access/srt_common.c
=
@@ -23,9 +23,6 @@
#include "srt_common.h"
-const char * const srt_key_length_names[] = { N_( "16 bytes" ), N_(
-"24 bytes" ), N_( "32 bytes" ), };
-
typedef struct parsed_param {
char *key;
char *val;
=
modules/access/srt_common.h
=
@@ -60,8 +60,8 @@
#define SRT_KEY_LENGTH_TEXT N_("Crypto key length in bytes")
#define SRT_DEFAULT_KEY_LENGTH 16
static const int srt_key_lengths[] = { 16, 24, 32, };
-
-extern const char * const srt_key_length_names[];
+static const char * const srt_key_length_names[] = { N_( "16 bytes" ), N_(
+"24 bytes" ), N_( "32 bytes" ), };
typedef struct srt_params {
int latency;
=
modules/video_output/libplacebo/utils.h
=
@@ -547,10 +547,6 @@ static const char * const filter_text[] = {
"Jinc",
"Sphinx",
"BC spline",
-"Catmull-Rom",
-"Mitchell-Netravali",
-"Robidoux",
-"RobidouxSharp",
"Bicubic",
"Spline16",
"Spline36",
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/5ce659d7218c419f01e30435f28645d090f70276...3f42195529cae2302a27ec0e6f0f8cf29658c58f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/5ce659d7218c419f01e30435f28645d090f70276...3f42195529cae2302a27ec0e6f0f8cf29658c58f
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] 10 commits: qt: fix deprecated warnings in videosurface.cpp
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
96c6d767 by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warnings in videosurface.cpp
- - - - -
e4a5bcd7 by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warnings in compositor_x11_uisurface.cpp
- - - - -
706c1b03 by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warning in controlbar_profile_model.cpp
- - - - -
7d0fba8c by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warning in custom_menus.cpp
- - - - -
e5e7a3e3 by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warning in qml_menu_wrapper.cpp
- - - - -
ecad138f by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warning in systempalettethemeprovider.cpp
- - - - -
8a8cf4c8 by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warning in control_list_model.cpp
- - - - -
65bffbc1 by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warning in color_scheme_model.cpp
- - - - -
a7be331f by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warning in navigation_history.cpp
- - - - -
5ce659d7 by Fatih Uzunoglu at 2024-04-28T14:01:46+00:00
qt: fix deprecated warning in extended.cpp
- - - - -
10 changed files:
- modules/gui/qt/dialogs/extended/extended.cpp
- modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp
- modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
- modules/gui/qt/maininterface/videosurface.cpp
- modules/gui/qt/menus/custom_menus.cpp
- modules/gui/qt/menus/qml_menu_wrapper.cpp
- modules/gui/qt/player/control_list_model.cpp
- modules/gui/qt/style/systempalettethemeprovider.cpp
- modules/gui/qt/util/color_scheme_model.cpp
- modules/gui/qt/util/navigation_history.cpp
Changes:
=
modules/gui/qt/dialogs/extended/extended.cpp
=
@@ -211,7 +211,7 @@ void ExtendedDialog::saveConfig()
i != hashConfig->end(); ++i )
{
QVariant &value = i.value();
-switch( static_cast(value.type()) )
+switch( static_cast(value.typeId()) )
{
case QMetaType::QString:
config_PutPsz( qtu(i.key()), qtu(value.toString()) );
=
modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp
=
@@ -521,7 +521,7 @@ bool ControlbarProfileModel::setData(const QModelIndex
&index, const QVariant &v
switch (role)
{
case Qt::DisplayRole:
-if (value.canConvert(QVariant::String))
+if (value.canConvert())
ptrProfile->setName(value.toString());
else
return false;
=
modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
=
@@ -288,8 +288,8 @@ bool CompositorX11UISurface::eventFilter(QObject*, QEvent
*event)
case QEvent::Enter:
{
QEnterEvent *enterEvent = static_cast(event);
-QEnterEvent mappedEvent(enterEvent->localPos(),
enterEvent->windowPos(),
-enterEvent->screenPos());
+QEnterEvent mappedEvent(enterEvent->position(),
enterEvent->scenePosition(),
+enterEvent->globalPosition());
bool ret = QCoreApplication::sendEvent(m_uiWindow, &mappedEvent);
event->setAccepted(mappedEvent.isAccepted());
return ret;
@@ -326,8 +326,8 @@ bool CompositorX11UISurface::eventFilter(QObject*, QEvent
*event)
case QEvent::MouseMove:
{
QMouseEvent* mouseEvent = static_cast(event);
-QMouseEvent mappedEvent(mouseEvent->type(), mouseEvent->localPos(),
-mouseEvent->localPos(),
mouseEvent->screenPos(),
+QMouseEvent mappedEvent(mouseEvent->type(), mouseEvent->position(),
+mouseEvent->position(),
mouseEvent->globalPosition(),
mouseEvent->button(), mouseEvent->buttons(),
mouseEvent->modifiers(), mouseEvent->source());
QCoreApplication::sendEvent(m_uiWindow, &mappedEvent);
=
modules/gui/qt/maininterface/videosurface.cpp
=
@@ -270,7 +270,7 @@ void VideoSurface::mouseReleaseEvent(QMouseEvent* event)
void VideoSurface::mouseMoveEvent(QMouseEvent* event)
{
-QPointF current_pos = event->localPos();
+QPointF current_pos = event->position();
QQuickWindow* window = this->window();
if (!window)
return;
@@ -281,7 +281,7 @@ void VideoSurface::mouseMoveEvent(QMouseEvent* event)
void VideoSurface::hoverMoveEvent(QHoverEvent* event)
{
-QPointF current_pos = event->posF();
+QPointF current_pos = event->position();
if (current_pos != m_oldHoverPos)
{
QQuickWindow* window = this->window();
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: converter_vaapi: Don't use DeriveImage with ExportSurfaceHandle
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
ea946360 by David Rosca at 2024-04-28T14:01:49+00:00
converter_vaapi: Don't use DeriveImage with ExportSurfaceHandle
DeriveImage is only needed when AcquireBufferHandle is used with old libva.
(cherry picked from commit b1e5a91d616190d931b999f223c8206bc94bc6c5)
- - - - -
374ce3b5 by David Rosca at 2024-04-28T14:01:49+00:00
vaapi: chroma: Implement vaPutImage upload fallback
(cherry picked from commit ac178ac8e3132b40330c1344fe3700b38ad0b552)
- - - - -
2 changed files:
- modules/hw/vaapi/chroma.c
- modules/video_output/opengl/converter_vaapi.c
Changes:
=
modules/hw/vaapi/chroma.c
=
@@ -252,18 +252,40 @@ UploadSurface(filter_t *filter, picture_t *src)
vlc_vaapi_PicAttachContext(dest_pic);
picture_CopyProperties(dest_pic, src);
-if (vlc_vaapi_DeriveImage(VLC_OBJECT(filter), va_dpy,
- vlc_vaapi_PicGetSurface(dest_pic), &dest_img)
-|| vlc_vaapi_MapBuffer(VLC_OBJECT(filter), va_dpy,
- dest_img.buf, &dest_buf))
+if (filter->p_sys->derive_failed ||
+vlc_vaapi_DeriveImage(VLC_OBJECT(filter), va_dpy,
+ vlc_vaapi_PicGetSurface(dest_pic), &dest_img))
+{
+if (filter->p_sys->image_fallback_failed)
+goto error;
+
+filter->p_sys->derive_failed = true;
+
+if (CreateFallbackImage(filter, dest_pic, va_dpy, &dest_img))
+{
+filter->p_sys->image_fallback_failed = true;
+goto error;
+}
+}
+
+if (vlc_vaapi_MapBuffer(VLC_OBJECT(filter), va_dpy,
+dest_img.buf, &dest_buf))
goto error;
FillVAImageFromPicture(&dest_img, dest_buf, dest_pic,
src, &filter->p_sys->cache);
-if (vlc_vaapi_UnmapBuffer(VLC_OBJECT(filter), va_dpy, dest_img.buf)
-|| vlc_vaapi_DestroyImage(VLC_OBJECT(filter),
- va_dpy, dest_img.image_id))
+if (vlc_vaapi_UnmapBuffer(VLC_OBJECT(filter), va_dpy, dest_img.buf))
+goto error;
+
+if (filter->p_sys->derive_failed &&
+vaPutImage(va_dpy, vlc_vaapi_PicGetSurface(dest_pic),
dest_img.image_id,
+ 0, 0, dest_pic->format.i_width, dest_pic->format.i_height,
+ 0, 0, dest_pic->format.i_width, dest_pic->format.i_height))
+goto error;
+
+if (vlc_vaapi_DestroyImage(VLC_OBJECT(filter),
+ va_dpy, dest_img.image_id))
goto error;
ret:
=
modules/video_output/opengl/converter_vaapi.c
=
@@ -72,9 +72,10 @@ struct priv
* (GPU tiling, compression, etc...) */
VADRMPRIMESurfaceDescriptor va_surface_descriptor;
#else
+VAImage va_image;
VABufferInfova_buffer_info;
#endif
-VAImage va_image;
+unsignednum_planes;
void * egl_images[3];
} last;
};
@@ -111,7 +112,7 @@ vaegl_release_last_pic(const opengl_tex_converter_t *tc,
struct priv *priv)
{
vlc_object_t *o = VLC_OBJECT(tc->gl);
-for (unsigned i = 0; i < priv->last.va_image.num_planes; ++i)
+for (unsigned i = 0; i < priv->last.num_planes; ++i)
vaegl_image_destroy(tc, priv->last.egl_images[i]);
#if VA_CHECK_VERSION(1, 1, 0)
@@ -119,9 +120,9 @@ vaegl_release_last_pic(const opengl_tex_converter_t *tc,
struct priv *priv)
close(priv->last.va_surface_descriptor.objects[i].fd);
#else
vlc_vaapi_ReleaseBufferHandle(o, priv->vadpy, priv->last.va_image.buf);
-#endif
vlc_vaapi_DestroyImage(o, priv->vadpy, priv->last.va_image.image_id);
+#endif
picture_Release(priv->last.pic);
}
@@ -182,26 +183,35 @@ tc_vaegl_update(const opengl_tex_converter_t *tc, GLuint
*textures,
(void) plane_offset;
struct priv *priv = tc->priv;
vlc_object_t *o = VLC_OBJECT(tc->gl);
-VAImage va_image;
#if VA_CHECK_VERSION(1, 1, 0)
VADRMPRIMESurfaceDescriptor va_surface_descriptor;
#else
+VAImage va_image;
VABufferInfo va_buffer_info;
#endif
EGLImageKHR egl_images[3] = { };
bool release_image = false, release_buffer_info = false;
+unsigned num_planes = 0;
if (pic == priv->last.pic)
{
-va_image = priv->last.va_image;
#if VA_CHECK_VERSION(1, 1, 0)
va_surface_descriptor = priv->last.va_surface_descriptor;
+#else
+va_image = priv->last.va_image;
#endif
-for (unsigned i = 0; i < priv->last.va_image.num_planes; ++i)
+for (unsigned i = 0; i < priv->last.num_planes; ++i)
egl_images[i] = priv->last.egl_images[i];
}
else
{
+#if VA_CHECK_VERSION(1, 1, 0)
+if (vlc_vaapi_ExportSurfaceHandle(o, priv->vadpy,
vlc_vaapi_PicGetSurface
[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: qt5compat: do not use Qt Shader Tools
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
bddef6ae by Fatih Uzunoglu at 2024-04-28T06:32:14+00:00
contrib: qt5compat: do not use Qt Shader Tools
Statically linking to Qt Shader Tools seems to
increase the binary size quite a lot.
Revert the patch which introduced runtime
shader compilation to QtGraphicalEffects
so that Qt Shader Tools is not linked.
TODO: Remove Qt5Compat completely, and
use MultiEffect instead.
- - - - -
7d6abadd by Fatih Uzunoglu at 2024-04-28T06:32:14+00:00
contrib: qt5compat: do not build core5
It is not used.
- - - - -
3 changed files:
- +
contrib/src/qt5compat/0001-Revert-Auxiliary-commit-to-revert-individual-files-f.patch
- + contrib/src/qt5compat/0002-Do-not-build-core5.patch
- contrib/src/qt5compat/rules.mak
Changes:
=
contrib/src/qt5compat/0001-Revert-Auxiliary-commit-to-revert-individual-files-f.patch
=
@@ -0,0 +1,806 @@
+From d17c8890da94ec44e8b80fa22a061765c799a293 Mon Sep 17 00:00:00 2001
+From: Fatih Uzunoglu
+Date: Fri, 19 Apr 2024 15:59:48 +0300
+Subject: [PATCH 1/2] Revert "Auxiliary commit to revert individual files from
+ 0ba059c6dc8b7c0f6ac4a277c96b6b16e43053a2"
+
+---
+ CMakeLists.txt| 5 -
+ src/imports/graphicaleffects5/CMakeLists.txt | 14 --
+ src/imports/graphicaleffects5/DropShadow.qml | 175 +-
+ src/imports/graphicaleffects5/Glow.qml| 126 -
+ .../graphicaleffects5/private/CMakeLists.txt | 9 -
+ .../graphicaleffects5/shaders_ng/compile.bat | 6 -
+ tests/manual/graphicaleffects5/CMakeLists.txt | 9 -
+ tests/manual/graphicaleffects5/main.qml | 47 +
+ tests/manual/graphicaleffects5/qml.qrc| 9 -
+ 9 files changed, 91 insertions(+), 309 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ac84544..ae465c1 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -18,9 +18,4 @@ find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG
OPTIONAL_COMPONENTS Network Xml
+
+ qt_internal_project_setup()
+
+-# Look for the target ShaderTools package to have access to the ShaderTools
Qt module library.
+-# This is optional. When not present, runtime shader processing will not be
available, and
+-# only a certain set of effects will be available
+-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS
ShaderTools)
+-
+ qt_build_repo()
+diff --git a/src/imports/graphicaleffects5/CMakeLists.txt
b/src/imports/graphicaleffects5/CMakeLists.txt
+index 00209ed..2889f33 100644
+--- a/src/imports/graphicaleffects5/CMakeLists.txt
b/src/imports/graphicaleffects5/CMakeLists.txt
+@@ -6,31 +6,23 @@
+ #
+
+ set(qml_files
+-"Blend.qml"
+ "BrightnessContrast.qml"
+ "ColorOverlay.qml"
+ "Colorize.qml"
+ "ConicalGradient.qml"
+ "Desaturate.qml"
+-"DirectionalBlur.qml"
+ "Displace.qml"
+ "DropShadow.qml"
+ "FastBlur.qml"
+ "GammaAdjust.qml"
+-"GaussianBlur.qml"
+ "Glow.qml"
+ "HueSaturation.qml"
+-"InnerShadow.qml"
+ "LevelAdjust.qml"
+ "LinearGradient.qml"
+-"MaskedBlur.qml"
+ "OpacityMask.qml"
+-"RadialBlur.qml"
+ "RadialGradient.qml"
+ "RectangularGlow.qml"
+-"RecursiveBlur.qml"
+ "ThresholdMask.qml"
+-"ZoomBlur.qml"
+ )
+
+ qt_internal_add_qml_module(qtgraphicaleffectsplugin
+@@ -68,12 +60,8 @@ set(qtgraphicaleffectsshaders_resource_files
+ "shaders_ng/fastblur.frag.qsb"
+ "shaders_ng/fastblur_internal.frag.qsb"
+ "shaders_ng/fastblur_internal.vert.qsb"
+-"shaders_ng/fastinnershadow.frag.qsb"
+-"shaders_ng/fastinnershadow_level0.frag.qsb"
+ "shaders_ng/fastglow.frag.qsb"
+ "shaders_ng/gammaadjust.frag.qsb"
+-"shaders_ng/gaussianinnershadow.frag.qsb"
+-"shaders_ng/gaussianinnershadow_shadow.frag.qsb"
+ "shaders_ng/huesaturation.frag.qsb"
+ "shaders_ng/leveladjust.frag.qsb"
+ "shaders_ng/lineargradient.vert.qsb"
+@@ -84,8 +72,6 @@ set(qtgraphicaleffectsshaders_resource_files
+ "shaders_ng/radialgradient.vert.qsb"
+ "shaders_ng/radialgradient_mask.frag.qsb"
+ "shaders_ng/radialgradient_nomask.frag.qsb"
+-"shaders_ng/recursiveblur.vert.qsb"
+-"shaders_ng/recursiveblur.frag.qsb"
+ "shaders_ng/rectangularglow.frag.qsb"
+ "shaders_ng/thresholdmask.frag.qsb"
+ )
+diff --git a/src/imports/graphicaleffects5/DropShadow.qml
b/src/imports/graphicaleffects5/DropShadow.qml
+index cdf3fd4..e31fb6b 100644
+--- a/src/imports/graphicaleffects5/DropShadow.qml
b/src/imports/graphicaleffects5/DropShadow.qml
+@@ -11,14 +11,9 @@ import Qt5Compat.GraphicalEffects.private
+ \since QtGraphicalEffects 1.0
+ \inherits QtQuick2::Item
+ \ingroup qtgraphicaleffects-drop-shadow
+-
+-\brief Generates a soft shadow behind the source item.
+-
+-The DropShadow effect blurs the alpha channel of the input, colorizes the
