modules/gui/macosx/library/VLCLibraryWindow.m

@@ -144,6 +144,12 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
     imageView.shadow = buttonShadow;
 }
 
+@interface VLCLibraryWindow ()
+
+@property BOOL presentLoadingOverlayOnVideoPlaybackHide;
+
+@end
+
 @implementation VLCLibraryWindow
 
 - (void)awakeFromNib
@@ -806,12 +812,19 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
     [self showControlsBarImmediately];
     [self updateArtworkButtonEnabledState];
     self.splitViewController.multifunctionSidebarViewController.mainVideoModeEnabled = NO;
+
+    if (self.presentLoadingOverlayOnVideoPlaybackHide) {
+        [self showLoadingOverlay];
+    }
 }
 
 - (void)showLoadingOverlay
 {
     if ([self.libraryTargetView.subviews containsObject:self.loadingOverlayView]) {
         return;
+    } else if ([self.libraryTargetView.subviews containsObject:self.videoViewController.view]) {
+        self.presentLoadingOverlayOnVideoPlaybackHide = YES;
+        return;
     }
 
     self.loadingOverlayView.wantsLayer = YES;
@@ -831,6 +844,8 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
 
 - (void)hideLoadingOverlay
 {
+    self.presentLoadingOverlayOnVideoPlaybackHide = NO;
+
     if (![self.libraryTargetView.subviews containsObject:self.loadingOverlayView]) {
         return;
     }

modules/gui/qt/maininterface/mainctx.cpp

@@ -61,6 +61,8 @@
 #include <QUrl>
 #include <QDate>
 #include <QMimeData>
+#include <QClipboard>
+#include <QInputDialog>
 
 #include <QQmlProperty>
 #include <QQmlContext>
@@ -829,6 +831,66 @@ VLCVarChoiceModel* MainCtx::getExtraInterfaces()
     return m_extraInterfaces;
 }
 
+bool MainCtx::pasteFromClipboard()
+{
+    assert(qApp);
+    const QClipboard *const clipboard = qApp->clipboard();
+    if (Q_UNLIKELY(!clipboard))
+        return false;
+    const QMimeData *mimeData = clipboard->mimeData(QClipboard::Selection);
+    if (!mimeData || !mimeData->hasUrls())
+        mimeData = clipboard->mimeData(QClipboard::Clipboard);
+
+    if (Q_UNLIKELY(!mimeData))
+        return false;
+
+    QList<QUrl> urlList = mimeData->urls();
+    QString text = mimeData->text();
+
+    if (urlList.count() > 1 || text.contains('\n'))
+    {
+        // NOTE: The reason that mime data for `text/uri-list` is not used
+        //       directly as the placeholder of the input dialog instead of
+        //       re-constructing is to decode the urls in the list.
+        QString placeholder;
+
+        if (urlList.isEmpty())
+        {
+            placeholder = std::move(text);
+        }
+        else
+        {
+            for (const auto& i : urlList)
+                placeholder += i.toString(QUrl::PrettyDecoded) + '\n';
+            placeholder.chop(1);
+        }
+
+        bool ok = false;
+        const QString ret = QInputDialog::getMultiLineText(nullptr,
+                                                           qtr("Paste from clipboard"),
+                                                           qtr("Do you want to enqueue the following URLs into the playlist?"),
+                                                           placeholder,
+                                                           &ok);
+        if (!ok)
+            return false;
+
+        for (const auto& i : QStringView(ret).split('\n'))
+        {
+            if (i.length() > 0)
+                THEMPL->append(i.trimmed().toString(), false);
+        }
+
+        return true;
+    }
+    else if ((urlList.count() == 1) || mimeData->hasText())
+    {
+        THEDP->openUrlDialog();
+        return true;
+    }
+
+    return false;
+}
+
 /*****************************************************************************
  * PopupMenuCB: callback triggered by the intf-popupmenu playlist variable.
  *  We don't show the menu directly here because we don't want the

modules/gui/qt/maininterface/mainctx.hpp

@@ -439,6 +439,8 @@ public slots:
     virtual void reloadPrefs();
     VLCVarChoiceModel* getExtraInterfaces();
 
+    bool pasteFromClipboard();
+
 protected slots:
     void onInputChanged( bool );
 

modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml

@@ -103,8 +103,8 @@ FocusScope {
 
             Widgets.RoundImage {
                 source: artist.cover || VLCStyle.noArtArtist
-                sourceSize.width: width
-                sourceSize.height: height
+                sourceSize.width: width * Screen.devicePixelRatio
+                sourceSize.height: height * Screen.devicePixelRatio
                 anchors.fill: parent
                 radius: VLCStyle.cover_normal
             }

modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 import QtQuick
+import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQml.Models
@@ -125,8 +126,8 @@ FocusScope {
                 source: (root.model && root.model.cover && root.model.cover !== "")
                     ?  root.model.cover
                     : VLCStyle.noArtAlbumCover
-                sourceSize.width: width
-                sourceSize.height: height
+                sourceSize.width: width * Screen.devicePixelRatio
+                sourceSize.height: height * Screen.devicePixelRatio
 
                 Widgets.DefaultShadow {
                     anchors.centerIn: parent

modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml

@@ -19,6 +19,7 @@
  *****************************************************************************/
 
 import QtQuick
+import QtQuick.Window
 import QtQuick.Templates as T
 import QtQuick.Layouts
 import QtQml.Models
@@ -166,8 +167,8 @@ T.ItemDelegate {
 
             source: (model.cover) ? model.cover
                                   : VLCStyle.noArtArtistSmall
-            sourceSize.width: width
-            sourceSize.height: height
+            sourceSize.width: width * Screen.devicePixelRatio
+            sourceSize.height: height * Screen.devicePixelRatio
 
             Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
 

modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 import QtQuick
+import QtQuick.Window
 import QtQuick.Controls
 import QtQml.Models
 import QtQuick.Layouts
@@ -113,8 +114,8 @@ FocusScope {
 
                             anchors.fill: parent
                             source: model.thumbnail || VLCStyle.noArtVideoCover
-                            sourceSize.width: width
-                            sourceSize.height: height
+                            sourceSize.width: width * Screen.devicePixelRatio
+                            sourceSize.height: height * Screen.devicePixelRatio
                             radius: VLCStyle.gridCover_radius
 
                             Widgets.DefaultShadow {

modules/gui/qt/menus/qml/GlobalShortcuts.qml

@@ -28,7 +28,7 @@ Item {
     ShortcutExt{ sequence:"Ctrl+D"; onActivated: DialogsProvider.openDiscDialog(); }
     ShortcutExt{ sequence:"Ctrl+N"; onActivated: DialogsProvider.openNetDialog(); }
     ShortcutExt{ sequence:"Ctrl+C"; onActivated: DialogsProvider.openCaptureDialog(); }
-    ShortcutExt{ sequence:"Ctrl+V"; onActivated: DialogsProvider.openUrlDialog(); }
+    ShortcutExt{ sequence: StandardKey.Paste; onActivated: MainCtx.pasteFromClipboard(); }
     ShortcutExt{ context: Qt.WindowShortcut; sequence:"Ctrl+Y"; onActivated: DialogsProvider.savePlayingToPlaylist(); }
     ShortcutExt{ sequence:"Ctrl+R"; onActivated: DialogsProvider.openAndTranscodingDialogs(); }
     ShortcutExt{ sequence:"Ctrl+S"; onActivated: DialogsProvider.openAndStreamingDialogs(); }

modules/gui/qt/widgets/qml/DragItem.qml

@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 import QtQuick
+import QtQuick.Window
 import QtQuick.Templates as T
 import QtQml.Models
 
@@ -471,7 +472,7 @@ Item {
                 height: coverSize
                 radius: bg.radius
                 source: modelData.artwork ?? ""
-                sourceSize: dragItem.imageSourceSize ?? Qt.size(width, height)
+                sourceSize: dragItem.imageSourceSize ?? Qt.size(width * Screen.devicePixelRatio, height * Screen.devicePixelRatio)
 
                 onStatusChanged: {
                     if (status === Image.Ready)

modules/gui/qt/widgets/qml/MediaCover.qml

@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 import QtQuick
+import QtQuick.Window
 import QtQuick.Controls
 
 
@@ -82,8 +83,8 @@ Rectangle {
 
         radius: root.radius
 
-        sourceSize.width: root.pictureWidth
-        sourceSize.height: root.pictureHeight
+        sourceSize.width: root.pictureWidth * Screen.devicePixelRatio
+        sourceSize.height: root.pictureHeight * Screen.devicePixelRatio
 
         onStatusChanged: {
             if (status === Image.Loading) {
@@ -112,8 +113,8 @@ Rectangle {
         // try to release the resources otherwise
         source: visible ? root.fallbackImageSource : ""
 
-        sourceSize.width: root.pictureWidth
-        sourceSize.height: root.pictureHeight
+        sourceSize.width: root.pictureWidth * Screen.devicePixelRatio
+        sourceSize.height: root.pictureHeight * Screen.devicePixelRatio
 
         cache: true
     }

modules/video_output/opengl/interop_vaapi.c

@@ -196,6 +196,21 @@ tc_vaegl_update(const struct vlc_gl_interop *interop, uint32_t textures[],
     (void) plane_offset;
     struct priv *priv = interop->priv;
     vlc_object_t *o = VLC_OBJECT(interop->gl);
+
+    if (pic == priv->last.pic)
+    {
+#if VA_CHECK_VERSION(1, 1, 0)
+        for (unsigned i = 0; i < priv->last.va_surface_descriptor.num_layers; ++i)
+#else
+        for (unsigned i = 0; i < priv->last.va_image.num_planes; ++i)
+#endif
+        {
+            priv->gl.BindTexture(interop->tex_target, textures[i]);
+            priv->glEGLImageTargetTexture2DOES(interop->tex_target, priv->last.egl_images[i]);
+        }
+        return VLC_SUCCESS;
+    }
+
 #if VA_CHECK_VERSION(1, 1, 0)
     VADRMPRIMESurfaceDescriptor va_surface_descriptor;
 #else
@@ -206,43 +221,30 @@ tc_vaegl_update(const struct vlc_gl_interop *interop, uint32_t textures[],
     bool release_image = false, release_buffer_info = false;
     unsigned num_planes = 0;
 
-    if (pic == priv->last.pic)
-    {
 #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.num_planes; ++i)
-            egl_images[i] = priv->last.egl_images[i];
-    }
-    else
-    {
-#if VA_CHECK_VERSION(1, 1, 0)
-        VA_CALL(o, vaSyncSurface, priv->vadpy, vlc_vaapi_PicGetSurface(pic));
-        if (vlc_vaapi_ExportSurfaceHandle(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic),
-                                          VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
-                                          VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
-                                          &va_surface_descriptor))
-            goto error;
-        release_image = true;
+    VA_CALL(o, vaSyncSurface, priv->vadpy, vlc_vaapi_PicGetSurface(pic));
+    if (vlc_vaapi_ExportSurfaceHandle(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic),
+                                      VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
+                                      VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
+                                      &va_surface_descriptor))
+        goto error;
+    release_image = true;
 #else
-        if (vlc_vaapi_DeriveImage(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic),
-                                  &va_image))
-            goto error;
-        release_image = true;
+    if (vlc_vaapi_DeriveImage(o, priv->vadpy, vlc_vaapi_PicGetSurface(pic),
+                              &va_image))
+        goto error;
+    release_image = true;
 
-        assert(va_image.format.fourcc == priv->fourcc);
+    assert(va_image.format.fourcc == priv->fourcc);
 
-        va_buffer_info = (VABufferInfo) {
-            .mem_type = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME
-        };
-        if (vlc_vaapi_AcquireBufferHandle(o, priv->vadpy, va_image.buf,
-                                          &va_buffer_info))
-            goto error;
+    va_buffer_info = (VABufferInfo) {
+        .mem_type = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME
+    };
+    if (vlc_vaapi_AcquireBufferHandle(o, priv->vadpy, va_image.buf,
+                                      &va_buffer_info))
+        goto error;
 #endif
-        release_buffer_info = true;
-    }
+    release_buffer_info = true;
 
 #if VA_CHECK_VERSION(1, 1, 0)
     num_planes = va_surface_descriptor.num_layers;
@@ -282,22 +284,19 @@ tc_vaegl_update(const struct vlc_gl_interop *interop, uint32_t textures[],
     }
 #endif
 
-    if (pic != priv->last.pic)
-    {
-        if (priv->last.pic != NULL)
-            vaegl_release_last_pic(interop, priv);
-        priv->last.pic = picture_Hold(pic);
+    if (priv->last.pic != NULL)
+        vaegl_release_last_pic(interop, priv);
+    priv->last.pic = picture_Hold(pic);
 #if VA_CHECK_VERSION(1, 1, 0)
-        priv->last.va_surface_descriptor = va_surface_descriptor;
+    priv->last.va_surface_descriptor = va_surface_descriptor;
 #else
-        priv->last.va_image = va_image;
-        priv->last.va_buffer_info = va_buffer_info;
+    priv->last.va_image = va_image;
+    priv->last.va_buffer_info = va_buffer_info;
 #endif
-        priv->last.num_planes = num_planes;
+    priv->last.num_planes = num_planes;
 
-        for (unsigned i = 0; i < num_planes; ++i)
-            priv->last.egl_images[i] = egl_images[i];
-    }
+    for (unsigned i = 0; i < num_planes; ++i)
+        priv->last.egl_images[i] = egl_images[i];
 
     return VLC_SUCCESS;