Changeset 176 for smplayer/trunk/src/prefperformance.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/prefperformance.cpp (modified) (14 diffs)

smplayer/trunk/src/prefperformance.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -22 +22 @@
 #include "global.h"
 #include "preferences.h"
-
-#ifdef YOUTUBE_SUPPORT
-#include "retrieveyoutubeurl.h"
-#endif
+#include "playerid.h"
 
 using namespace Global;
@@ -34 +31 @@
         setupUi(this);
 
+        hwdec_combo->addItem(tr("None"), "no");
+        hwdec_combo->addItem(tr("Auto"), "auto");
+        #ifdef Q_OS_LINUX
+        hwdec_combo->addItem("vdpau", "vdpau");
+        hwdec_combo->addItem("vaapi", "vaapi");
+        hwdec_combo->addItem("vaapi-copy", "vaapi-copy");
+        #endif
+        #ifdef Q_OS_OSX
+        hwdec_combo->addItem("vda", "vda");
+        #endif
+        #ifdef Q_OS_WIN
+        hwdec_combo->addItem("dxva2-copy", "dxva2-copy");
+        #endif
+
         // Priority is only for windows, so we disable for other systems
 #ifndef Q_OS_WIN
@@ -43 +54 @@
 #endif
 
-#ifdef YOUTUBE_SUPPORT
-        yt_quality_combo->addItem( "240p (flv)", RetrieveYoutubeUrl::FLV_240p );
-
-        yt_quality_combo->addItem( "360p (flv)", RetrieveYoutubeUrl::FLV_360p );
-        yt_quality_combo->addItem( "360p (mp4)", RetrieveYoutubeUrl::MP4_360p );
-        yt_quality_combo->addItem( "360p (webm)", RetrieveYoutubeUrl::WEBM_360p );
-
-        yt_quality_combo->addItem( "480p (flv)", RetrieveYoutubeUrl::FLV_480p );
-        yt_quality_combo->addItem( "480p (webm)", RetrieveYoutubeUrl::WEBM_480p );
-
-        yt_quality_combo->addItem( "720p (mp4)", RetrieveYoutubeUrl::MP4_720p );
-        yt_quality_combo->addItem( "720p (webm)", RetrieveYoutubeUrl::WEBM_720p );
-
-        yt_quality_combo->addItem( "1080p (mp4)", RetrieveYoutubeUrl::MP4_1080p );
-        yt_quality_combo->addItem( "1080p (webm)", RetrieveYoutubeUrl::WEBM_1080p );
-#else
-        yt_label->hide();
-        yt_quality_combo->hide();
-        yt_line->hide();
+#ifndef OBSOLETE_FAST_AUDIO_CHANGE
+        fast_audio_label->hide();
+        fast_audio_combo->hide();
 #endif
 
@@ -113 +108 @@
         setFastChapterSeeking( pref->fast_chapter_change );
 #endif
+#ifdef OBSOLETE_FAST_AUDIO_CHANGE
         setFastAudioSwitching( pref->fast_audio_change );
+#endif
         setThreads( pref->threads );
-
-#ifdef YOUTUBE_SUPPORT
-        setYTQuality( pref->yt_quality );
-#endif
+        setHwdec( pref->hwdec );
 }
 
@@ -139 +133 @@
         TEST_AND_SET(pref->fast_chapter_change, fastChapterSeeking());
 #endif
+#ifdef OBSOLETE_FAST_AUDIO_CHANGE
         pref->fast_audio_change = fastAudioSwitching();
+#endif
         TEST_AND_SET(pref->threads, threads());
-
-#ifdef YOUTUBE_SUPPORT
-        pref->yt_quality = YTQuality();
-#endif
+        TEST_AND_SET(pref->hwdec, hwdec());
 }
 
@@ -245 +238 @@
 #endif
 
+#ifdef OBSOLETE_FAST_AUDIO_CHANGE
 void PrefPerformance::setFastAudioSwitching(Preferences::OptionState value) {
         fast_audio_combo->setState(value);
@@ -252 +246 @@
         return fast_audio_combo->state();
 }
+#endif
 
 void PrefPerformance::setThreads(int v) {
@@ -261 +256 @@
 }
 
-#ifdef YOUTUBE_SUPPORT
-void PrefPerformance::setYTQuality(int q) {
-        yt_quality_combo->setCurrentIndex(yt_quality_combo->findData(q));
-}
-
-int PrefPerformance::YTQuality() {
-        int index = yt_quality_combo->currentIndex();
-    return yt_quality_combo->itemData(index).toInt();
-}
-#endif
+void PrefPerformance::setHwdec(const QString & v) {
+        int idx = hwdec_combo->findData(v);
+        if (idx < 0) idx = 0;
+        hwdec_combo->setCurrentIndex(idx);
+}
+
+QString PrefPerformance::hwdec() {
+        int idx = hwdec_combo->currentIndex();
+        return hwdec_combo->itemData(idx).toString();
+}
 
 void PrefPerformance::createHelp() {
@@ -280 +275 @@
 #ifdef Q_OS_WIN
         setWhatsThis(priority_combo, tr("Priority"), 
-                tr("Set process priority for mplayer according to the predefined "
+                tr("Set process priority for %1 according to the predefined "
            "priorities available under Windows.<br>"
-           "<b>Warning:</b> Using realtime priority can cause system lockup."));
+           "<b>Warning:</b> Using realtime priority can cause system lockup.").arg(PLAYER_NAME));
 #endif
 
@@ -296 +291 @@
            "MPEG-1/2 and H.264") );
 
-        setWhatsThis(coreavc_check, tr("Use CoreAVC if no other codec specified"),
-                tr("Try to use non-free CoreAVC codec when no other codec is specified "
-           "and non-VDPAU video output selected. Requires MPlayer build with CoreAVC support."));
+        setWhatsThis(hwdec_combo, tr("Hardware decoding"),
+                tr("Sets the hardware video decoding API. "
+                   "If hardware decoding is not possible, software decoding will be used instead.") + " " +
+                tr("Available options:") +
+                        "<ul>"
+                        "<li>" + tr("None: only software decoding will be used.") + "</li>"
+                        "<li>" + tr("Auto: it tries to automatically enable hardware decoding using the first available method.") + "</li>"
+                        #ifdef Q_OS_LINUX
+                        "<li>" + tr("vdpau: for the vdpau and opengl video outputs.") + "</li>"
+                        "<li>" + tr("vaapi: for the opengl and vaapi video outputs. For Intel GPUs only.") + "</li>"
+                        "<li>" + tr("vaapi-copy: it copies video back into system RAM. For Intel GPUs only.") + "</li>"
+                        #endif
+                        #ifdef Q_OS_WIN
+                        "<li>" + tr("dxva2-copy: it copies video back to system RAM. Experimental.") + "</li>"
+                        #endif
+                        "</ul>"
+                #ifdef MPLAYER_SUPPORT
+                + tr("This option only works with mpv.")
+                #endif
+                );
 
         setWhatsThis(loopfilter_combo, tr("Skip loop filter"),
@@ -316 +328 @@
            "greater.").arg(pref->HD_height) +"<br>" );
 
+        setWhatsThis(coreavc_check, tr("Use CoreAVC if no other codec specified"),
+                tr("Try to use the non-free CoreAVC codec when no other codec is specified "
+           "and a non-VDPAU video output is selected.") +" "+
+        tr("Requires a %1 build with CoreAVC support.").arg(PLAYER_NAME));
+
+#ifdef OBSOLETE_FAST_AUDIO_CHANGE
         setWhatsThis(fast_audio_combo, tr("Fast audio track switching"),
                 tr("Possible values:<br> "
@@ -324 +342 @@
            "<b>Auto</b>: SMPlayer will decide what to do according to the "
            "MPlayer version." ) );
+#endif
 
 #if !SMART_DVD_CHAPTERS
@@ -331 +350 @@
 #endif
 
-#ifdef YOUTUBE_SUPPORT
-        setWhatsThis(yt_quality_combo, tr("Youtube quality"),
-                tr("Select the preferred quality for youtube videos.") );
-#endif
-
         addSectionTitle(tr("Cache"));