Upload 3.9.3-2 to unstable

[minitube] / src / videodefinition.cpp

diff --git a/src/videodefinition.cpp b/src/videodefinition.cpp
index 12cfd12c1f0c2e914fff892b049e17ae0cefd4e5..360817f99963db0b7033d672b930afab3a8bbf0c 100644 (file)
--- a/src/videodefinition.cpp
+++ b/src/videodefinition.cpp
@@ -21,40 +21,56 @@ $END_LICENSE */
 #include "videodefinition.h"
 
 namespace {
-static const int kEmptyDefinitionCode = -1;
-
-static const VideoDefinition kEmptyDefinition(QString(), kEmptyDefinitionCode);
+const int kEmptyDefinitionCode = -1;
 
 template <typename T, T (VideoDefinition::*Getter)() const>
 const VideoDefinition &getDefinitionForImpl(T matchValue) {
     const auto &defs = VideoDefinition::getDefinitions();
+
+    for (auto i = defs.rbegin(); i != defs.rend(); ++i) {
+        if ((*i.*Getter)() == matchValue) return *i;
+    }
+    /*
     for (const VideoDefinition &def : defs) {
         if ((def.*Getter)() == matchValue) return def;
     }
+    */
+    static const VideoDefinition kEmptyDefinition(QString(), kEmptyDefinitionCode);
     return kEmptyDefinition;
 }
-}
+} // namespace
 
-// static
 const QVector<VideoDefinition> &VideoDefinition::getDefinitions() {
+    // List preferred equivalent format last:
+    // algo selects the last format with same name first
     static const QVector<VideoDefinition> definitions = {
-            VideoDefinition(QLatin1String("360p"), 18), VideoDefinition(QLatin1String("720p"), 22),
-            VideoDefinition(QLatin1String("1080p"), 37)};
+            VideoDefinition("240p", 242),      VideoDefinition("240p", 133),
+            VideoDefinition("360p", 243),      VideoDefinition("360p", 396),
+            VideoDefinition("360p", 18, true), VideoDefinition("480p", 244),
+            VideoDefinition("480p", 135),      VideoDefinition("720p", 247),
+            VideoDefinition("720p", 136),      VideoDefinition("720p", 22, true),
+            VideoDefinition("1080p", 248),     VideoDefinition("1080p", 137),
+            VideoDefinition("1440p", 271),     VideoDefinition("2160p", 313),
+    };
     return definitions;
 }
 
-// static
+const QVector<QString> &VideoDefinition::getDefinitionNames() {
+    static const QVector<QString> names = {"480p", "720p", "1080p", "1440p", "2160p"};
+    return names;
+}
+
 const VideoDefinition &VideoDefinition::forName(const QString &name) {
     return getDefinitionForImpl<const QString &, &VideoDefinition::getName>(name);
 }
 
-// static
 const VideoDefinition &VideoDefinition::forCode(int code) {
     return getDefinitionForImpl<int, &VideoDefinition::getCode>(code);
 }
 
-VideoDefinition::VideoDefinition(const QString &name, int code) : m_name(name), m_code(code) {}
+VideoDefinition::VideoDefinition(const QString &name, int code, bool hasAudioStream)
+    : name(name), code(code), hasAudioStream(hasAudioStream) {}
 
 bool VideoDefinition::isEmpty() const {
-    return m_code == kEmptyDefinitionCode && m_name.isEmpty();
+    return code == kEmptyDefinitionCode && name.isEmpty();
 }