Merge pull request #549 from IENT/bugfix/547-FilenameFormatGuessBug

Fix error in QSize to our Size conversion
IENT · Dec 3, 2023 · 8b96878 · 8b96878
2 parents b56c923 + 94e061a
commit 8b96878
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/YUViewLib/src/common/Typedef.h b/YUViewLib/src/common/Typedef.h
@@ -227,7 +227,6 @@ template <typename T> using vector4d = std::vector<vector3d<T>>;
 template <typename T, size_t N> using array               = std::array<T, N>;
 template <typename T, size_t N1, size_t N2> using array2d = std::array<std::array<T, N2>, N1>;
 
-
 template <typename T> int indexInVec(const std::vector<T> &vec, const T &item)
 {
   auto it = std::find(vec.begin(), vec.end(), item);
@@ -264,10 +263,6 @@ struct Ratio
 struct Size
 {
   constexpr Size(unsigned width, unsigned height) : width(width), height(height) {}
-  constexpr Size(int width, int height)
-      : width(static_cast<unsigned>(width)), height(static_cast<unsigned>(height))
-  {
-  }
   constexpr Size() = default;
 
   constexpr bool operator==(const Size &other) const

diff --git a/YUViewLib/src/decoder/decoderDav1d.cpp b/YUViewLib/src/decoder/decoderDav1d.cpp
@@ -89,6 +89,13 @@ Subsampling convertFromInternalSubsampling(Dav1dPixelLayout layout)
 
 } // namespace
 
+Size Dav1dPictureWrapper::getFrameSize() const
+{
+  if (this->curPicture.p.w < 0 || this->curPicture.p.h < 0)
+    return {};
+  return Size({static_cast<unsigned>(curPicture.p.w), static_cast<unsigned>(curPicture.p.h)});
+}
+
 Subsampling Dav1dPictureWrapper::getSubsampling() const
 {
   return convertFromInternalSubsampling(curPicture.p.layout);

diff --git a/YUViewLib/src/decoder/decoderDav1d.h b/YUViewLib/src/decoder/decoderDav1d.h
@@ -69,7 +69,7 @@ class Dav1dPictureWrapper
   void setInternalsSupported() { internalsSupported = true; }
 
   void                    clear() { memset(&curPicture, 0, sizeof(Dav1dPicture)); }
-  Size                    getFrameSize() const { return Size({curPicture.p.w, curPicture.p.h}); }
+  Size                    getFrameSize() const;
   Dav1dPicture *          getPicture() const { return (Dav1dPicture *)(&curPicture); }
   video::yuv::Subsampling getSubsampling() const;
   int                     getBitDepth() const { return curPicture.p.bpc; }

diff --git a/YUViewLib/src/ffmpeg/AVCodecContextWrapper.cpp b/YUViewLib/src/ffmpeg/AVCodecContextWrapper.cpp
@@ -452,7 +452,9 @@ AVPixelFormat AVCodecContextWrapper::getPixelFormat()
 Size AVCodecContextWrapper::getSize()
 {
   this->update();
-  return {this->width, this->height};
+  if (this->width < 0 || this->height < 0)
+    return {};
+  return {static_cast<unsigned>(this->width), static_cast<unsigned>(this->height)};
 }
 
 AVColorSpace AVCodecContextWrapper::getColorspace()

diff --git a/YUViewLib/src/playlistitem/playlistItemRawFile.cpp b/YUViewLib/src/playlistitem/playlistItemRawFile.cpp
@@ -69,7 +69,9 @@ playlistItemRawFile::playlistItemRawFile(const QString &rawFilePath,
     return;
   }
 
-  auto frameSize = Size(qFrameSize.width(), qFrameSize.height());
+  Size frameSize;
+  if (qFrameSize.width() > 0 && qFrameSize.height() > 0)
+    frameSize = Size(qFrameSize.width(), qFrameSize.height());
 
   // Create a new videoHandler instance depending on the input format
   QFileInfo fi(rawFilePath);