Add test cases for RGB conversion. Next, RGB565.

Author: Christian Feldmann

YUViewLib/src/common/Functions.cpp

@@ -198,6 +198,21 @@ std::string toLower(const std::string_view str)
   return lowercaseStr;
 }
 
+std::vector<std::string_view> splitString(const std::string_view str, const char delimiter)
+{
+  std::vector<std::string_view> result;
+  size_t                        start = 0;
+  size_t                        end   = str.find(delimiter);
+  while (end != std::string_view::npos)
+  {
+    result.emplace_back(str.substr(start, end - start));
+    start = end + 1;
+    end   = str.find(delimiter, start);
+  }
+  result.emplace_back(str.substr(start));
+  return result;
+}
+
 ByteVector readData(std::istream &istream, const size_t nrBytes)
 {
   ByteVector data;
@@ -225,11 +240,11 @@ std::optional<unsigned> toUnsigned(const std::string_view text)
 std::optional<int> toInt(const std::string_view text)
 {
   int        value{};
-  const auto result = std::from_chars(text.data(), text.data() + text.size(), value);
+  const auto result = std::from_chars(text.data(), text.end(), value);
 
   if (result.ec != std::errc())
     return {};
-  const auto allCharactersParsed = (result.ptr == &(*text.end()));
+  const auto allCharactersParsed = (result.ptr == text.end());
   if (!allCharactersParsed)
     return {};
 

YUViewLib/src/common/Functions.h

@@ -36,6 +36,7 @@
 
 #include <istream>
 #include <optional>
+#include <vector>
 
 namespace functions
 {
@@ -77,8 +78,11 @@ template <size_t N> QStringList toQStringList(const std::array<std::string_view,
   return list;
 }
 
-std::string toLower(const std::string_view str);
-ByteVector  readData(std::istream &istream, const size_t nrBytes);
+std::string                   toLower(const std::string_view str);
+std::optional<int>            toInt(const std::string_view str);
+std::vector<std::string_view> splitString(const std::string_view str, const char delimiter);
+
+ByteVector readData(std::istream &istream, const size_t nrBytes);
 
 template <typename T> unsigned clipToUnsigned(T val)
 {

YUViewLib/src/handler/ItemMemoryHandler.cpp

@@ -1,34 +1,34 @@
 /*  This file is part of YUView - The YUV player with advanced analytics toolset
-*   <https://github.com/IENT/YUView>
-*   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
-*
-*   This program is free software; you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation; either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   In addition, as a special exception, the copyright holders give
-*   permission to link the code of portions of this program with the
-*   OpenSSL library under certain conditions as described in each
-*   individual source file, and distribute linked combinations including
-*   the two.
-*   
-*   You must obey the GNU General Public License in all respects for all
-*   of the code used other than OpenSSL. If you modify file(s) with this
-*   exception, you may extend this exception to your version of the
-*   file(s), but you are not obligated to do so. If you do not wish to do
-*   so, delete this exception statement from your version. If you delete
-*   this exception statement from all source files in the program, then
-*   also delete it here.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ *   <https://github.com/IENT/YUView>
+ *   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   In addition, as a special exception, the copyright holders give
+ *   permission to link the code of portions of this program with the
+ *   OpenSSL library under certain conditions as described in each
+ *   individual source file, and distribute linked combinations including
+ *   the two.
+ *
+ *   You must obey the GNU General Public License in all respects for all
+ *   of the code used other than OpenSSL. If you modify file(s) with this
+ *   exception, you may extend this exception to your version of the
+ *   file(s), but you are not obligated to do so. If you do not wish to do
+ *   so, delete this exception statement from your version. If you delete
+ *   this exception statement from all source files in the program, then
+ *   also delete it here.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "ItemMemoryHandler.h"
 
@@ -48,26 +48,32 @@ namespace itemMemoryHandler
 
 struct ItemData
 {
-  QString filePath;
-  QDateTime itemChangedLast;
-  QString format;
-  QString toString() const { return QString("File: %1 Last Changed: %2 Format: %3").arg(filePath).arg(itemChangedLast.toString("yy-M-d H-m-s")).arg(format); }
+  QString     filePath;
+  QDateTime   itemChangedLast;
+  std::string format;
+  QString     toString() const
+  {
+    return QString("File: %1 Last Changed: %2 Format: %3")
+      .arg(filePath)
+      .arg(itemChangedLast.toString("yy-M-d H-m-s"))
+      .arg(format);
+  }
 };
 
 QList<ItemData> getAllValidItems()
 {
-  QSettings settings;
+  QSettings       settings;
   QList<ItemData> validItems;
-  auto timeYesterday = QDateTime::currentDateTime().addDays(-2);
+  auto            timeYesterday = QDateTime::currentDateTime().addDays(-2);
 
   auto size = settings.beginReadArray("itemMemory");
-  for (int i = 0; i < size; ++i) 
+  for (int i = 0; i < size; ++i)
   {
     settings.setArrayIndex(i);
     ItemData data;
-    data.filePath = settings.value("filePath").toString();
+    data.filePath        = settings.value("filePath").toString();
     data.itemChangedLast = settings.value("dateChanged").toDateTime();
-    data.format = settings.value("format").toString();
+    data.format          = settings.value("format").toString().toStdString();
     if (data.itemChangedLast >= timeYesterday)
     {
       validItems.append(data);
@@ -86,22 +92,22 @@ QList<ItemData> getAllValidItems()
 void writeNewItemList(QList<ItemData> newItemList)
 {
   QSettings settings;
-  settings.remove("itemMemory");  // Delete the old list
+  settings.remove("itemMemory"); // Delete the old list
 
   settings.beginWriteArray("itemMemory");
-  for (int i = 0; i < newItemList.size(); ++i) 
+  for (int i = 0; i < newItemList.size(); ++i)
   {
     const auto &item = newItemList[i];
     settings.setArrayIndex(i);
     settings.setValue("filePath", item.filePath);
     settings.setValue("dateChanged", QVariant(item.itemChangedLast));
-    settings.setValue("format", item.format);
+    settings.setValue("format", QString::fromStdString(item.format));
     DEBUG_MEMORY("writeNewItemList Written item " << item.toString());
   }
   settings.endArray();
 }
 
-void itemMemoryAddFormat(QString filePath, QString format)
+void itemMemoryAddFormat(const QString &filePath, const std::string &format)
 {
   auto validItems = getAllValidItems();
 
@@ -111,8 +117,8 @@ void itemMemoryAddFormat(QString filePath, QString format)
     if (validItems[i].filePath == filePath)
     {
       validItems[i].itemChangedLast = QDateTime::currentDateTime();
-      validItems[i].format = format;
-      itemUpdated = true;
+      validItems[i].format          = format;
+      itemUpdated                   = true;
       DEBUG_MEMORY("itemMemoryAddFormat Modified item " << validItems[i].toString());
       break;
     }
@@ -121,17 +127,17 @@ void itemMemoryAddFormat(QString filePath, QString format)
   if (!itemUpdated)
   {
     ItemData newItem;
-    newItem.filePath = filePath;
+    newItem.filePath        = filePath;
     newItem.itemChangedLast = QDateTime::currentDateTime();
-    newItem.format = format;
+    newItem.format          = format;
     validItems.append(newItem);
     DEBUG_MEMORY("itemMemoryAddFormat Added new item " << newItem.toString());
   }
-  
+
   writeNewItemList(validItems);
 }
 
-QString itemMemoryGetFormat(QString filePath)
+std::optional<std::string> itemMemoryGetFormat(const QString &filePath)
 {
   auto validItems = getAllValidItems();
 

YUViewLib/src/handler/ItemMemoryHandler.h

@@ -1,34 +1,34 @@
 /*  This file is part of YUView - The YUV player with advanced analytics toolset
-*   <https://github.com/IENT/YUView>
-*   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
-*
-*   This program is free software; you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation; either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   In addition, as a special exception, the copyright holders give
-*   permission to link the code of portions of this program with the
-*   OpenSSL library under certain conditions as described in each
-*   individual source file, and distribute linked combinations including
-*   the two.
-*   
-*   You must obey the GNU General Public License in all respects for all
-*   of the code used other than OpenSSL. If you modify file(s) with this
-*   exception, you may extend this exception to your version of the
-*   file(s), but you are not obligated to do so. If you do not wish to do
-*   so, delete this exception statement from your version. If you delete
-*   this exception statement from all source files in the program, then
-*   also delete it here.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ *   <https://github.com/IENT/YUView>
+ *   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   In addition, as a special exception, the copyright holders give
+ *   permission to link the code of portions of this program with the
+ *   OpenSSL library under certain conditions as described in each
+ *   individual source file, and distribute linked combinations including
+ *   the two.
+ *
+ *   You must obey the GNU General Public License in all respects for all
+ *   of the code used other than OpenSSL. If you modify file(s) with this
+ *   exception, you may extend this exception to your version of the
+ *   file(s), but you are not obligated to do so. If you do not wish to do
+ *   so, delete this exception statement from your version. If you delete
+ *   this exception statement from all source files in the program, then
+ *   also delete it here.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 
@@ -40,7 +40,7 @@ namespace itemMemoryHandler
 /* Simple memory that uses QSettings to save the format for a file.
  * Entries older then 48 hours are automatically deleted.
  */
-void itemMemoryAddFormat(QString filePath, QString format);
-QString itemMemoryGetFormat(QString filePath);
+void                       itemMemoryAddFormat(const QString &filePath, const std::string &format);
+std::optional<std::string> itemMemoryGetFormat(const QString &filePath);
 
 } // namespace itemMemoryHandler

YUViewLib/src/playlistitem/playlistItemRawFile.cpp

@@ -122,10 +122,10 @@ playlistItemRawFile::playlistItemRawFile(const QString &rawFilePath,
     if (!this->parseY4MFile())
       return;
   }
-  else if (!pixelFormatFromMemory.isEmpty())
+  else if (!pixelFormatFromMemory)
   {
     // Use the format that we got from the memory. Don't do any auto detection.
-    this->video->setFormatFromString(pixelFormatFromMemory);
+    this->video->setFormatFromString(*pixelFormatFromMemory);
   }
   else if (!frameSize.isValid() && sourcePixelFormat.isEmpty())
   {
@@ -563,9 +563,9 @@ void playlistItemRawFile::slotVideoPropertiesChanged()
 {
   DEBUG_RAWFILE("playlistItemRawFile::slotVideoPropertiesChanged");
 
-  auto currentPixelFormat = video->getFormatAsString();
-  if (currentPixelFormat != this->pixelFormatAfterLoading)
-    itemMemoryHandler::itemMemoryAddFormat(this->properties().name, currentPixelFormat);
+  const auto currentPixelFormat = video->getFormatAsString();
+  if (currentPixelFormat && currentPixelFormat != this->pixelFormatAfterLoading)
+    itemMemoryHandler::itemMemoryAddFormat(this->properties().name, *currentPixelFormat);
 }
 
 ValuePairListSets playlistItemRawFile::getPixelValues(const QPoint &pixelPos, int frameIdx)

YUViewLib/src/playlistitem/playlistItemRawFile.h

@@ -64,7 +64,7 @@ class playlistItemRawFile : public playlistItemWithVideo
   // Create a new playlistItemRawFile from the playlist file entry. Return nullptr if parsing
   // failed.
   static playlistItemRawFile *newplaylistItemRawFile(const YUViewDomElement &root,
-                                                     const QString &         playlistFilePath);
+                                                     const QString          &playlistFilePath);
 
   virtual bool canBeUsedInProcessing() const override { return true; }
 
@@ -116,5 +116,5 @@ private slots:
   bool            isY4MFile{};
   QList<uint64_t> y4mFrameIndices;
 
-  QString pixelFormatAfterLoading{};
+  std::optional<std::string> pixelFormatAfterLoading{};
 };