Add external dependency LibFFmpeg

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "submodules/LibFFmpeg"]
+	path = submodules/LibFFmpeg
+	url = git@github.com:ChristianFeldmann/LibFFmpeg.git
 [submodule "submodules/googletest"]
 	path = submodules/googletest
 	url = git@github.com:google/googletest.git

YUView.pro

@@ -1,9 +1,11 @@
 TEMPLATE = subdirs
-SUBDIRS = YUViewLib YUViewApp
+SUBDIRS = YUViewLib YUViewApp LibFFmpeg
 
 YUViewApp.subdir = YUViewApp
 YUViewLib.subdir = YUViewLib
+LibFFmpeg.subdir = submodules/LibFFmpeg
 
+YUViewLib.depends = LibFFmpeg
 YUViewApp.depends = YUViewLib
 
 UNITTESTS {

YUViewLib/YUViewLib.pro

@@ -12,6 +12,7 @@ HEADERS += $$files(src/*.h, true)
 FORMS += $$files(ui/*.ui, false)
 
 INCLUDEPATH += src/
+INCLUDEPATH += $$top_srcdir/submodules
 
 RESOURCES += \
     images/images.qrc \

YUViewLib/src/common/FileInfo.h → YUViewLib/src/common/InfoItemAndData.h

@@ -37,26 +37,14 @@
 #include <QString>
 
 /*
- * An info item has a name, a text and an optional toolTip. These are used to show them in the
- * fileInfoWidget. For example: ["File Name", "file.yuv"] or ["Number Frames", "123"] Another option
- * is to show a button. If the user clicks on it, the callback function infoListButtonPressed() for
- * the corresponding playlist item is called.
+ * An info item has a name, a text and an optional description. These are used to show them in the
+ * fileInfoWidget. For example: ["File Name", "file.yuv"] or ["Number Frames", "123"].
  */
 struct InfoItem
 {
-  InfoItem(const QString &name,
-           const QString &text,
-           const QString &toolTip  = QString(),
-           bool           button   = false,
-           int            buttonID = -1)
-      : name(name), text(text), button(button), buttonID(buttonID), toolTip(toolTip)
-  {
-  }
-  QString name{};
-  QString text{};
-  bool    button{};
-  int     buttonID{};
-  QString toolTip{};
+  std::string name{};
+  std::string text{};
+  std::string description{};
 };
 
 struct InfoData

YUViewLib/src/filesource/DataSourceLocalFile.cpp

@@ -0,0 +1,102 @@
+/*  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/>.
+ */
+
+#include "DataSourceLocalFile.h"
+
+DataSourceLocalFile::DataSourceLocalFile(const std::filesystem::path &filePath)
+{
+  this->file.open(filePath.string(), std::ios_base::in | std::ios_base::binary);
+}
+
+std::vector<InfoItem> DataSourceLocalFile::getInfoList() const
+{
+  if (!this->isReady())
+    return {};
+
+  std::vector<InfoItem> infoList;
+  infoList.push_back(
+      InfoItem({"File path", this->filePath.string(), "The absolute path of the local file"}));
+  if (const auto size = this->fileSize())
+    infoList.push_back(InfoItem({"File Size", std::to_string(*size)}));
+
+  return infoList;
+}
+
+bool DataSourceLocalFile::atEnd() const
+{
+  return this->file.eof();
+}
+
+bool DataSourceLocalFile::isReady() const
+{
+  return !this->file.fail();
+}
+
+std::int64_t DataSourceLocalFile::position() const
+{
+  return this->filePosition;
+}
+
+std::optional<std::int64_t> DataSourceLocalFile::fileSize() const
+{
+  if (!this->isFileOpened)
+    return {};
+
+  const auto size = std::filesystem::file_size(this->filePath);
+  return static_cast<std::int64_t>(size);
+}
+
+bool DataSourceLocalFile::seek(const std::int64_t pos)
+{
+  if (!this->isReady())
+    return false;
+
+  this->file.seekg(static_cast<std::streampos>(pos));
+  return this->isReady();
+}
+
+std::int64_t DataSourceLocalFile::read(ByteVector &buffer, const std::int64_t nrBytes)
+{
+  if (!this->isReady())
+    return 0;
+
+  const auto usize = static_cast<size_t>(nrBytes);
+  if (buffer.size() < nrBytes)
+    buffer.resize(usize);
+
+  this->file.read(reinterpret_cast<char *>(buffer.data()), usize);
+
+  const auto bytesRead = this->file.gcount();
+
+  this->filePosition += bytesRead;
+  return static_cast<std::int64_t>(bytesRead);
+}

YUViewLib/src/filesource/DataSourceLocalFile.h

@@ -0,0 +1,60 @@
+/*  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/>.
+ */
+
+#pragma once
+
+#include "IDataSource.h"
+
+#include <filesystem>
+#include <fstream>
+
+class DataSourceLocalFile : public IDataSource
+{
+public:
+  DataSourceLocalFile(const std::filesystem::path &filePath);
+
+  virtual [[nodiscard]] std::vector<InfoItem>       getInfoList() const override;
+  virtual [[nodiscard]] bool                        atEnd() const override;
+  virtual [[nodiscard]] bool                        isReady() const override;
+  virtual [[nodiscard]] std::int64_t                position() const override;
+  virtual [[nodiscard]] std::optional<std::int64_t> fileSize() const;
+
+  virtual [[nodiscard]] bool         seek(const std::int64_t pos) override;
+  virtual [[nodiscard]] std::int64_t read(ByteVector &buffer, const std::int64_t nrBytes) override;
+
+protected:
+  std::filesystem::path filePath{};
+  bool                  isFileOpened{};
+
+  std::ifstream file{};
+  std::int64_t  filePosition{};
+};

YUViewLib/src/filesource/FileSource.cpp

@@ -34,10 +34,9 @@
 
 #include <common/Typedef.h>
 
-#include <QDateTime>
-#include <QDir>
-#include <QSettings>
-#include <QtGlobal>
+#include <QFileInfo>
+#include <QMutexLocker>
+
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
@@ -47,40 +46,51 @@
 #include <QThread>
 #endif
 
-FileSource::FileSource()
+FileSource::FileSource() : FileSourceWithLocalFile()
 {
-  connect(&fileWatcher,
-          &QFileSystemWatcher::fileChanged,
-          this,
-          &FileSource::fileSystemWatcherFileChanged);
 }
 
 bool FileSource::openFile(const QString &filePath)
 {
-  // Check if the file exists
-  this->fileInfo.setFile(filePath);
-  if (!this->fileInfo.exists() || !this->fileInfo.isFile())
+  QFileInfo fileInfo(filePath);
+  if (!fileInfo.exists() || !fileInfo.isFile())
     return false;
 
-  if (this->isFileOpened && this->srcFile.isOpen())
+  if (this->srcFile.isOpen())
     this->srcFile.close();
 
-  // open file for reading
   this->srcFile.setFileName(filePath);
   this->isFileOpened = this->srcFile.open(QIODevice::ReadOnly);
   if (!this->isFileOpened)
     return false;
 
-  // Save the full file path
   this->fullFilePath = filePath;
 
-  // Install a watcher for the file (if file watching is active)
   this->updateFileWatchSetting();
-  this->fileChanged = false;
 
   return true;
 }
 
+bool FileSource::atEnd() const
+{
+  return !this->isFileOpened ? true : this->srcFile.atEnd();
+}
+
+QByteArray FileSource::readLine()
+{
+  return !this->isFileOpened ? QByteArray() : this->srcFile.readLine();
+}
+
+bool FileSource::seek(int64_t pos)
+{
+  return !this->isFileOpened ? false : this->srcFile.seek(pos);
+}
+
+int64_t FileSource::pos()
+{
+  return !this->isFileOpened ? 0 : this->srcFile.pos();
+}
+
 #if SSE_CONVERSION
 // Resize the target array if necessary and read the given number of bytes to the data array
 void FileSource::readBytes(byteArrayAligned &targetBuffer, int64_t startPos, int64_t nrBytes)
@@ -96,10 +106,9 @@ void FileSource::readBytes(byteArrayAligned &targetBuffer, int64_t startPos, int
 }
 #endif
 
-// Resize the target array if necessary and read the given number of bytes to the data array
 int64_t FileSource::readBytes(QByteArray &targetBuffer, int64_t startPos, int64_t nrBytes)
 {
-  if (!this->isOk())
+  if (!this->isOpened())
     return 0;
 
   if (targetBuffer.size() < nrBytes)
@@ -115,73 +124,6 @@ int64_t FileSource::readBytes(QByteArray &targetBuffer, int64_t startPos, int64_
   return this->srcFile.read(targetBuffer.data(), nrBytes);
 }
 
-QList<InfoItem> FileSource::getFileInfoList() const
-{
-  QList<InfoItem> infoList;
-
-  if (!this->isFileOpened)
-    return infoList;
-
-  infoList.append(InfoItem("File Path", this->fileInfo.absoluteFilePath()));
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-  auto createdtime = this->fileInfo.created().toString("yyyy-MM-dd hh:mm:ss");
-#else
-  auto createdtime = this->fileInfo.birthTime().toString("yyyy-MM-dd hh:mm:ss");
-#endif
-  infoList.append(InfoItem("Time Created", createdtime));
-  infoList.append(
-      InfoItem("Time Modified", this->fileInfo.lastModified().toString("yyyy-MM-dd hh:mm:ss")));
-  infoList.append(InfoItem("Nr Bytes", QString("%1").arg(this->fileInfo.size())));
-
-  return infoList;
-}
-
-QString FileSource::getAbsoluteFilePath() const
-{
-  return this->isFileOpened ? this->fileInfo.absoluteFilePath() : QString();
-}
-
-// If you are loading a playlist and you have an absolute path and a relative path, this function
-// will return the absolute path (if a file with that absolute path exists) or convert the relative
-// path to an absolute one and return that (if that file exists). If neither exists the empty string
-// is returned.
-QString FileSource::getAbsPathFromAbsAndRel(const QString &currentPath,
-                                            const QString &absolutePath,
-                                            const QString &relativePath)
-{
-  QFileInfo checkAbsoluteFile(absolutePath);
-  if (checkAbsoluteFile.exists())
-    return absolutePath;
-
-  QFileInfo plFileInfo(currentPath);
-  auto      combinePath = QDir(plFileInfo.path()).filePath(relativePath);
-  QFileInfo checkRelativeFile(combinePath);
-  if (checkRelativeFile.exists() && checkRelativeFile.isFile())
-  {
-    return QDir::cleanPath(combinePath);
-  }
-
-  return {};
-}
-
-bool FileSource::getAndResetFileChangedFlag()
-{
-  bool b            = this->fileChanged;
-  this->fileChanged = false;
-  return b;
-}
-
-void FileSource::updateFileWatchSetting()
-{
-  // Install a file watcher if file watching is active in the settings.
-  // The addPath/removePath functions will do nothing if called twice for the same file.
-  QSettings settings;
-  if (settings.value("WatchFiles", true).toBool())
-    fileWatcher.addPath(this->fullFilePath);
-  else
-    fileWatcher.removePath(this->fullFilePath);
-}
-
 void FileSource::clearFileCache()
 {
   if (!this->isFileOpened)