Upload 3.9.3-2 to unstable

[minitube] / src / videodefinition.cpp

diff --git a/src/videodefinition.cpp b/src/videodefinition.cpp
index 28e3024d0515096adc5799f1689584ab4b0fdb30..360817f99963db0b7033d672b930afab3a8bbf0c 100644 (file)
--- a/src/videodefinition.cpp
+++ b/src/videodefinition.cpp
@@ -20,30 +20,57 @@ $END_LICENSE */
 
 #include "videodefinition.h"
 
-QStringList VideoDefinition::getDefinitionNames() {
-    static QStringList definitionNames = QStringList() << "360p" << "720p" << "1080p";
-    return definitionNames;
-}
+namespace {
+const int kEmptyDefinitionCode = -1;
 
-QList<int> VideoDefinition::getDefinitionCodes() {
-    static QList<int> definitionCodes = QList<int>() << 18 << 22 << 37;
-    return definitionCodes;
-}
+template <typename T, T (VideoDefinition::*Getter)() const>
+const VideoDefinition &getDefinitionForImpl(T matchValue) {
+    const auto &defs = VideoDefinition::getDefinitions();
 
-QHash<QString, int> VideoDefinition::getDefinitions() {
-    static QHash<QString, int> definitions;
-    if (definitions.isEmpty()) {
-        definitions.insert("360p", 18);
-        definitions.insert("720p", 22);
-        definitions.insert("1080p", 37);
+    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
+
+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("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;
 }
 
-int VideoDefinition::getDefinitionCode(QString name) {
-    return VideoDefinition::getDefinitions().value(name);
+const QVector<QString> &VideoDefinition::getDefinitionNames() {
+    static const QVector<QString> names = {"480p", "720p", "1080p", "1440p", "2160p"};
+    return names;
 }
 
-QString VideoDefinition::getDefinitionName(int code) {
-    return getDefinitions().key(code);
+const VideoDefinition &VideoDefinition::forName(const QString &name) {
+    return getDefinitionForImpl<const QString &, &VideoDefinition::getName>(name);
+}
+
+const VideoDefinition &VideoDefinition::forCode(int code) {
+    return getDefinitionForImpl<int, &VideoDefinition::getCode>(code);
+}
+
+VideoDefinition::VideoDefinition(const QString &name, int code, bool hasAudioStream)
+    : name(name), code(code), hasAudioStream(hasAudioStream) {}
+
+bool VideoDefinition::isEmpty() const {
+    return code == kEmptyDefinitionCode && name.isEmpty();
 }