From 10cc2d278c189b3181088b1ab6a21eacc1102377 Mon Sep 17 00:00:00 2001
From: zhouyuanyuan <zhouyuanyuan@dzw.com>
Date: Thu, 30 Jul 2026 18:09:52 +0800
Subject: [PATCH 1/2] Fix crash caused by dereferencing empty YUV frame format

---
 YUViewLib/src/video/yuv/videoHandlerYUV.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/YUViewLib/src/video/yuv/videoHandlerYUV.h b/YUViewLib/src/video/yuv/videoHandlerYUV.h
index 22b2efee1..b6b6f694b 100644
--- a/YUViewLib/src/video/yuv/videoHandlerYUV.h
+++ b/YUViewLib/src/video/yuv/videoHandlerYUV.h
@@ -137,6 +137,8 @@ class videoHandlerYUV : public videoHandler
   virtual std::optional<std::string> getFormatAsString() const override
   {
     const auto frameFormat = FrameHandler::getFormatAsString();
+    if (!frameFormat)
+      return {};
     return *frameFormat + ";YUV;" + this->srcPixelFormat.getName();
   }
   virtual bool setFormatFromString(const std::string_view format) override;

From 49e2ab9e07f66ecddff186c6c97d9d131709d9d9 Mon Sep 17 00:00:00 2001
From: Christian Feldmann <christian.feldmann@nokia.com>
Date: Wed, 5 Aug 2026 23:02:59 +0200
Subject: [PATCH 2/2] Reformat and add tests for videoHandlerYUV

---
 YUViewLib/src/video/yuv/videoHandlerYUV.cpp   |   8 +
 YUViewLib/src/video/yuv/videoHandlerYUV.h     |   8 +-
 .../VideoHandlerRawTestDataLoader.cpp         |   6 +-
 .../{rgb => }/VideoHandlerRawTestDataLoader.h |   4 +-
 .../video/rgb/videoHandlerRGBTest.cpp         |   3 +-
 .../video/yuv/PixelFormatYUVHelper.cpp        |  69 ++++++++
 .../video/yuv/PixelFormatYUVHelper.h          |  42 +++++
 .../video/yuv/PixelFormatYUVTest.cpp          |  40 +----
 .../video/yuv/videoHandlerYUVTest.cpp         | 162 ++++++++++++++++++
 9 files changed, 292 insertions(+), 50 deletions(-)
 rename YUViewUnitTest/video/{rgb => }/VideoHandlerRawTestDataLoader.cpp (97%)
 rename YUViewUnitTest/video/{rgb => }/VideoHandlerRawTestDataLoader.h (97%)
 create mode 100644 YUViewUnitTest/video/yuv/PixelFormatYUVHelper.cpp
 create mode 100644 YUViewUnitTest/video/yuv/PixelFormatYUVHelper.h
 create mode 100644 YUViewUnitTest/video/yuv/videoHandlerYUVTest.cpp

diff --git a/YUViewLib/src/video/yuv/videoHandlerYUV.cpp b/YUViewLib/src/video/yuv/videoHandlerYUV.cpp
index 013affa53..70b97437f 100644
--- a/YUViewLib/src/video/yuv/videoHandlerYUV.cpp
+++ b/YUViewLib/src/video/yuv/videoHandlerYUV.cpp
@@ -3151,6 +3151,14 @@ void videoHandlerYUV::setFormatFromCorrelation(const QByteArray &rawYUVData, int
   }
 }
 
+std::optional<std::string> videoHandlerYUV::getFormatAsString() const
+{
+  const auto frameFormat = FrameHandler::getFormatAsString();
+  if (!frameFormat)
+    return {};
+  return *frameFormat + ";YUV;" + this->srcPixelFormat.getName();
+}
+
 bool videoHandlerYUV::setFormatFromString(const std::string_view format)
 {
   DEBUG_YUV("videoHandlerYUV::setFormatFromString " << format << "\n");
diff --git a/YUViewLib/src/video/yuv/videoHandlerYUV.h b/YUViewLib/src/video/yuv/videoHandlerYUV.h
index b6b6f694b..d732c7f82 100644
--- a/YUViewLib/src/video/yuv/videoHandlerYUV.h
+++ b/YUViewLib/src/video/yuv/videoHandlerYUV.h
@@ -134,13 +134,7 @@ class videoHandlerYUV : public videoHandler
   virtual void setFormatFromCorrelation(const QByteArray &rawYUVData,
                                         int64_t           fileSize = -1) override;
 
-  virtual std::optional<std::string> getFormatAsString() const override
-  {
-    const auto frameFormat = FrameHandler::getFormatAsString();
-    if (!frameFormat)
-      return {};
-    return *frameFormat + ";YUV;" + this->srcPixelFormat.getName();
-  }
+  virtual std::optional<std::string> getFormatAsString() const override;
   virtual bool setFormatFromString(const std::string_view format) override;
 
   // Create the YUV controls and return a pointer to the layout.
diff --git a/YUViewUnitTest/video/rgb/VideoHandlerRawTestDataLoader.cpp b/YUViewUnitTest/video/VideoHandlerRawTestDataLoader.cpp
similarity index 97%
rename from YUViewUnitTest/video/rgb/VideoHandlerRawTestDataLoader.cpp
rename to YUViewUnitTest/video/VideoHandlerRawTestDataLoader.cpp
index 80d26915c..c0442cc80 100644
--- a/YUViewUnitTest/video/rgb/VideoHandlerRawTestDataLoader.cpp
+++ b/YUViewUnitTest/video/VideoHandlerRawTestDataLoader.cpp
@@ -32,9 +32,9 @@
 
 #include "VideoHandlerRawTestDataLoader.h"
 
-#include <video/rgb/videoHandlerRGB.h>
+#include <video/videoHandler.h>
 
-namespace video::rgb::test
+namespace video::test
 {
 
 videoHandlerDataLoadingTest::videoHandlerDataLoadingTest(video::videoHandler *video) : video(video)
@@ -79,4 +79,4 @@ void videoHandlerDataLoadingTest::loadRawTestData(int frameIdx, bool forceDecodi
   video->rawData_frameIndex = frameIdx;
 }
 
-} // namespace video::rgb::test
+} // namespace video::test
diff --git a/YUViewUnitTest/video/rgb/VideoHandlerRawTestDataLoader.h b/YUViewUnitTest/video/VideoHandlerRawTestDataLoader.h
similarity index 97%
rename from YUViewUnitTest/video/rgb/VideoHandlerRawTestDataLoader.h
rename to YUViewUnitTest/video/VideoHandlerRawTestDataLoader.h
index e9d7a8e22..8d5518496 100644
--- a/YUViewUnitTest/video/rgb/VideoHandlerRawTestDataLoader.h
+++ b/YUViewUnitTest/video/VideoHandlerRawTestDataLoader.h
@@ -38,7 +38,7 @@ namespace video
 class videoHandler;
 }
 
-namespace video::rgb::test
+namespace video::test
 {
 
 class videoHandlerDataLoadingTest : public QObject
@@ -64,4 +64,4 @@ public slots:
   std::queue<LoadingRequest> expectedLoadingRequests;
 };
 
-} // namespace video::rgb::test
+} // namespace video::test
diff --git a/YUViewUnitTest/video/rgb/videoHandlerRGBTest.cpp b/YUViewUnitTest/video/rgb/videoHandlerRGBTest.cpp
index 42c3f2e70..77f4df320 100644
--- a/YUViewUnitTest/video/rgb/videoHandlerRGBTest.cpp
+++ b/YUViewUnitTest/video/rgb/videoHandlerRGBTest.cpp
@@ -33,12 +33,13 @@
 #include <common/Testing.h>
 #include <video/rgb/videoHandlerRGB.h>
 
-#include "VideoHandlerRawTestDataLoader.h"
+#include "../VideoHandlerRawTestDataLoader.h"
 
 namespace video::rgb::test
 {
 
 using namespace std::string_literals;
+using video::test::videoHandlerDataLoadingTest;
 
 namespace
 {
diff --git a/YUViewUnitTest/video/yuv/PixelFormatYUVHelper.cpp b/YUViewUnitTest/video/yuv/PixelFormatYUVHelper.cpp
new file mode 100644
index 000000000..7140503d7
--- /dev/null
+++ b/YUViewUnitTest/video/yuv/PixelFormatYUVHelper.cpp
@@ -0,0 +1,69 @@
+/*  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 "PixelFormatYUVHelper.h"
+
+namespace video::yuv::test
+{
+
+std::vector<PixelFormatYUV> getAllPixelFormats()
+{
+  std::vector<PixelFormatYUV> allFormats;
+
+  for (const auto subsampling : SubsamplingMapper.getValues())
+  {
+    for (const auto bitsPerSample : BitDepthList)
+    {
+      const auto endianList =
+        (bitsPerSample > 8) ? std::vector<bool>({false, true}) : std::vector<bool>({false});
+
+      // Planar
+      for (const auto planeOrder : PlaneOrderMapper.getValues())
+        for (const auto bigEndian : endianList)
+          allFormats.push_back(PixelFormatYUV(subsampling, bitsPerSample, planeOrder, bigEndian));
+
+      // Packet
+      for (const auto packingOrder : getSupportedPackingFormats(subsampling))
+        for (const auto bytePacking : {false, true})
+          for (const auto bigEndian : endianList)
+            allFormats.push_back(
+              PixelFormatYUV(subsampling, bitsPerSample, packingOrder, bytePacking, bigEndian));
+    }
+  }
+
+  for (auto predefinedFormat : PredefinedPixelFormatMapper.getValues())
+    allFormats.push_back(PixelFormatYUV(predefinedFormat));
+
+  return allFormats;
+}
+
+} // namespace video::yuv::test
diff --git a/YUViewUnitTest/video/yuv/PixelFormatYUVHelper.h b/YUViewUnitTest/video/yuv/PixelFormatYUVHelper.h
new file mode 100644
index 000000000..937e63082
--- /dev/null
+++ b/YUViewUnitTest/video/yuv/PixelFormatYUVHelper.h
@@ -0,0 +1,42 @@
+/*  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 <video/yuv/PixelFormatYUV.h>
+
+#include <vector>
+
+namespace video::yuv::test
+{
+
+std::vector<PixelFormatYUV> getAllPixelFormats();
+
+}
diff --git a/YUViewUnitTest/video/yuv/PixelFormatYUVTest.cpp b/YUViewUnitTest/video/yuv/PixelFormatYUVTest.cpp
index 79815769a..46fc1034c 100644
--- a/YUViewUnitTest/video/yuv/PixelFormatYUVTest.cpp
+++ b/YUViewUnitTest/video/yuv/PixelFormatYUVTest.cpp
@@ -34,48 +34,14 @@
 
 #include <video/yuv/PixelFormatYUV.h>
 
-namespace video::yuv::test
-{
-
-namespace
-{
+#include "PixelFormatYUVHelper.h"
 
-std::vector<PixelFormatYUV> getAllFormats()
+namespace video::yuv::test
 {
-  std::vector<PixelFormatYUV> allFormats;
-
-  for (const auto subsampling : SubsamplingMapper.getValues())
-  {
-    for (const auto bitsPerSample : BitDepthList)
-    {
-      const auto endianList =
-        (bitsPerSample > 8) ? std::vector<bool>({false, true}) : std::vector<bool>({false});
-
-      // Planar
-      for (const auto planeOrder : PlaneOrderMapper.getValues())
-        for (const auto bigEndian : endianList)
-          allFormats.push_back(PixelFormatYUV(subsampling, bitsPerSample, planeOrder, bigEndian));
-
-      // Packet
-      for (const auto packingOrder : getSupportedPackingFormats(subsampling))
-        for (const auto bytePacking : {false, true})
-          for (const auto bigEndian : endianList)
-            allFormats.push_back(
-              PixelFormatYUV(subsampling, bitsPerSample, packingOrder, bytePacking, bigEndian));
-    }
-  }
-
-  for (auto predefinedFormat : PredefinedPixelFormatMapper.getValues())
-    allFormats.push_back(PixelFormatYUV(predefinedFormat));
-
-  return allFormats;
-}
-
-} // namespace
 
 TEST(PixelFormatYUVTest, testFormatFromToString)
 {
-  for (const auto fmt : getAllFormats())
+  for (const auto fmt : getAllPixelFormats())
   {
     const auto name = fmt.getName();
     EXPECT_TRUE(fmt.isValid()) << "Format " << name << " is invalid.";
diff --git a/YUViewUnitTest/video/yuv/videoHandlerYUVTest.cpp b/YUViewUnitTest/video/yuv/videoHandlerYUVTest.cpp
new file mode 100644
index 000000000..6c9260ec8
--- /dev/null
+++ b/YUViewUnitTest/video/yuv/videoHandlerYUVTest.cpp
@@ -0,0 +1,162 @@
+/*  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 <common/Testing.h>
+#include <video/yuv/videoHandlerYUV.h>
+
+#include "../VideoHandlerRawTestDataLoader.h"
+
+#include "PixelFormatYUVHelper.h"
+
+namespace video::yuv::test
+{
+
+using video::test::videoHandlerDataLoadingTest;
+
+namespace
+{
+
+// 4x4 YUV 4:4:4 planar test data encoded as Y plane, U plane, V plane.
+// The values are chosen so that the raw YUV samples can be asserted directly.
+const auto TEST_DATA_YUV_444_4x4 = QByteArray::fromHex("000102030405060708090a0b0c0d0e0f"
+                                                       "101112131415161718191a1b1c1d1e1f"
+                                                       "202122232425262728292a2b2c2d2e2f");
+
+void expectDifferenceImageToBeZero(const QImage &differenceImage)
+{
+  ASSERT_EQ(differenceImage.size(), QSize(4, 4));
+
+  for (int y = 0; y < differenceImage.height(); y++)
+  {
+    for (int x = 0; x < differenceImage.width(); x++)
+    {
+      const auto pixelValue = differenceImage.pixel(x, y);
+      EXPECT_EQ(qRed(pixelValue), 130);
+      EXPECT_EQ(qGreen(pixelValue), 130);
+      EXPECT_EQ(qBlue(pixelValue), 130);
+    }
+  }
+}
+
+void expectPixelValues(const QStringPairList &values,
+                       const int              expectedY,
+                       const int              expectedU,
+                       const int              expectedV)
+{
+  ASSERT_EQ(values.size(), 3u);
+  EXPECT_EQ(values[0].first, "Y");
+  EXPECT_EQ(values[0].second.toInt(), expectedY);
+  EXPECT_EQ(values[1].first, "U");
+  EXPECT_EQ(values[1].second.toInt(), expectedU);
+  EXPECT_EQ(values[2].first, "V");
+  EXPECT_EQ(values[2].second.toInt(), expectedV);
+}
+
+} // namespace
+
+TEST(videoHandlerYUVTest, defaultConstructor_shouldHaveInvalidFormat)
+{
+  videoHandlerYUV handler;
+
+  EXPECT_FALSE(handler.isFormatValid());
+  EXPECT_EQ(handler.getCachingFrameSize(), 0u);
+  EXPECT_EQ(handler.getBytesPerFrame(), 0);
+  EXPECT_TRUE(handler.getPixelValues(QPoint(0, 0), 0).isEmpty());
+  EXPECT_FALSE(handler.getFormatAsString().has_value());
+  EXPECT_EQ(handler.getRawPixelFormatYUVName(), QString("YUV 4:2:0 8-bit"));
+}
+
+TEST(videoHandlerYUVTest, settingFormat_shouldReturnExpectedFormatAsStringAndBeLoadableFromString)
+{
+  videoHandlerYUV handler;
+  handler.setFrameSize({4, 4});
+  videoHandlerYUV loadedHandler;
+
+  for (const auto format : getAllPixelFormats())
+  {
+    handler.setPixelFormatYUV(format);
+
+    const auto formatAsString = handler.getFormatAsString();
+    ASSERT_TRUE(formatAsString.has_value());
+
+    std::string expectedFormatAsString = "4;4;YUV;" + format.getName();
+    EXPECT_EQ(*formatAsString, expectedFormatAsString);
+
+    EXPECT_TRUE(loadedHandler.setFormatFromString(*formatAsString));
+    EXPECT_EQ(loadedHandler.getFrameSize(), Size(4, 4));
+    EXPECT_EQ(loadedHandler.getRawPixelFormatYUVName(), QString::fromStdString(format.getName()));
+  }
+}
+
+TEST(videoHandlerYUVTest, testLoadFrame_444Planar_shouldReturnExpectedPixelValues)
+{
+  videoHandlerYUV handler;
+  handler.setFrameSize({4, 4});
+  handler.setPixelFormatYUV(PixelFormatYUV(Subsampling::YUV_444, 8, PlaneOrder::YUV));
+
+  videoHandlerDataLoadingTest dataLoader(&handler);
+  dataLoader.addExpectedLoadingRequests({0, TEST_DATA_YUV_444_4x4});
+
+  handler.loadFrame(0, false);
+
+  const auto valuesOrigin = handler.getPixelValues(QPoint(0, 0), 0);
+  expectPixelValues(valuesOrigin, 0x00, 0x10, 0x20);
+
+  const auto valuesCenter = handler.getPixelValues(QPoint(2, 2), 0);
+  expectPixelValues(valuesCenter, 0x0a, 0x1a, 0x2a);
+}
+
+TEST(videoHandlerYUVTest, testCalculateDifference_444Planar_sameInput_shouldReturnZeroDifference)
+{
+  videoHandlerYUV handler1;
+  handler1.setFrameSize({4, 4});
+  handler1.setPixelFormatYUV(PixelFormatYUV(Subsampling::YUV_444, 8, PlaneOrder::YUV));
+  videoHandlerDataLoadingTest dataLoader1(&handler1);
+  dataLoader1.addExpectedLoadingRequests({0, TEST_DATA_YUV_444_4x4});
+
+  videoHandlerYUV handler2;
+  handler2.setFrameSize({4, 4});
+  handler2.setPixelFormatYUV(PixelFormatYUV(Subsampling::YUV_444, 8, PlaneOrder::YUV));
+  videoHandlerDataLoadingTest dataLoader2(&handler2);
+  dataLoader2.addExpectedLoadingRequests({0, TEST_DATA_YUV_444_4x4});
+
+  QList<InfoItem> differenceInfoList;
+  QImage          differenceImage =
+    handler1.calculateDifference(&handler2, 0, 0, differenceInfoList, 1, false);
+
+  EXPECT_FALSE(differenceImage.isNull());
+  EXPECT_EQ(differenceImage.size(), QSize(4, 4));
+  expectDifferenceImageToBeZero(differenceImage);
+  EXPECT_FALSE(differenceInfoList.isEmpty());
+}
+
+} // namespace video::yuv::test