Fixed some clang warnings / errors

IENT · Feb 22, 2021 · 2d29d61 · 2d29d61
1 parent ca13165
commit 2d29d61
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/YUViewLib/src/decoder/decoderVVDec.cpp b/YUViewLib/src/decoder/decoderVVDec.cpp
@@ -287,7 +287,7 @@ bool decoderVVDec::getNextFrameFromDecoder()
       return setErrorB("Received a frame of different size");
     if (this->formatYUV.subsampling != subsampling)
       return setErrorB("Received a frame with different subsampling");
-    if (this->formatYUV.bitsPerSample != bitDepth)
+    if (unsigned(this->formatYUV.bitsPerSample) != bitDepth)
       return setErrorB("Received a frame with different bit depth");
   }
 

diff --git a/YUViewLib/src/decoder/decoderVVDec.h b/YUViewLib/src/decoder/decoderVVDec.h
@@ -110,7 +110,6 @@ class decoderVVDec : public decoderBaseSingleLib
   // Try to get the next picture from the decoder and save it in currentHMPic
   bool getNextFrameFromDecoder();
 
-  bool internalsSupported{false};
   int  nrSignals{0};
   bool flushing{false};
 

diff --git a/YUViewLib/src/filesource/FileSourceFFmpegFile.cpp b/YUViewLib/src/filesource/FileSourceFFmpegFile.cpp
@@ -377,7 +377,7 @@ std::pair<int64_t, size_t> FileSourceFFmpegFile::getClosestSeekableFrameBefore(i
   {
     if (pic.frame >= 0) 
     {
-      if (pic.frame <= frameIdx)
+      if (frameIdx > 0 && pic.frame <= unsigned(frameIdx))
       {
         // We could seek here
         bestSeekDTS = pic.dts;

diff --git a/YUViewLib/src/parser/AnnexB.h b/YUViewLib/src/parser/AnnexB.h
@@ -135,7 +135,7 @@ class AnnexB : public Base
          fileStartEndPos;          //< The start and end position of all slice NAL units (if known)
     bool randomAccessPoint{false}; //< Can we start decoding here?
 
-    bool operator<(AnnexBFrame const &b) { return (this->poc < b.poc); }
+    bool operator<(AnnexBFrame const &b) const { return (this->poc < b.poc); }
   };
 
   // Returns false if the POC was already present int the list

diff --git a/YUViewLib/src/parser/VVC/AnnexBVVC.cpp b/YUViewLib/src/parser/VVC/AnnexBVVC.cpp
@@ -149,7 +149,7 @@ std::optional<AnnexB::SeekData> AnnexBVVC::getSeekData(int iFrameNr)
         continue;
       }
 
-      if (picHeader->PicOrderCntVal == seekPOC)
+      if (seekPOC >= 0 && picHeader->PicOrderCntVal == unsigned(seekPOC))
       {
         // Seek here
         AnnexB::SeekData seekData;

diff --git a/YUViewLib/src/parser/VVC/ref_pic_list_struct.cpp b/YUViewLib/src/parser/VVC/ref_pic_list_struct.cpp
@@ -69,7 +69,7 @@ void ref_pic_list_struct::parse(SubByteReaderLogging &                  reader,
       {
         this->st_ref_pic_flag[i] = reader.readFlag(formatArray("st_ref_pic_flag", i));
       }
-      if (this->getStRefPicFlag(listIdx, rplsIdx, i))
+      if (this->getStRefPicFlag(i))
       {
         this->abs_delta_poc_st[i] = reader.readUEV(formatArray("abs_delta_poc_st", i));
 
@@ -99,17 +99,17 @@ void ref_pic_list_struct::parse(SubByteReaderLogging &                  reader,
   // (148)
   this->NumLtrpEntries = 0;
   for (unsigned i = 0; i < this->num_ref_entries; i++)
-    if (!this->inter_layer_ref_pic_flag[i] && !this->getStRefPicFlag(listIdx, rplsIdx, i))
+    if (!this->inter_layer_ref_pic_flag[i] && !this->getStRefPicFlag(i))
       this->NumLtrpEntries++;
 
   // (150)
   for (unsigned i = 0; i < this->num_ref_entries; i++)
-    if (!this->inter_layer_ref_pic_flag[i] && this->getStRefPicFlag(listIdx, rplsIdx, i))
+    if (!this->inter_layer_ref_pic_flag[i] && this->getStRefPicFlag(i))
       this->DeltaPocValSt[i] =
           (1 - 2 * int(this->strp_entry_sign_flag[i])) * this->AbsDeltaPocSt[i];
 }
 
-bool ref_pic_list_struct::getStRefPicFlag(unsigned listIdx, unsigned rplsIdx, unsigned i)
+bool ref_pic_list_struct::getStRefPicFlag(unsigned i)
 {
   // The default value of a non existent st_ref_pic_flag is true
   if (!this->inter_layer_ref_pic_flag[i] && this->st_ref_pic_flag.count(i) == 0)

diff --git a/YUViewLib/src/parser/VVC/ref_pic_list_struct.h b/YUViewLib/src/parser/VVC/ref_pic_list_struct.h
@@ -64,7 +64,7 @@ class ref_pic_list_struct
   umap_1d<int>  DeltaPocValSt;
 
 private:
-  bool getStRefPicFlag(unsigned listIdx, unsigned rplsIdx, unsigned i);
+  bool getStRefPicFlag(unsigned i);
 };
 
 } // namespace parser::vvc
diff --git a/YUViewLib/src/playlistitem/playlistItemCompressedVideo.cpp b/YUViewLib/src/playlistitem/playlistItemCompressedVideo.cpp
@@ -519,7 +519,7 @@ void playlistItemCompressedVideo::loadRawData(int frameIdx, bool caching)
         std::tie(seekToDTS, seekToFrame) = inputFileFFmpegLoading->getClosestSeekableFrameBefore(frameIdx);
     }
 
-    if (curFrameIdx == -1 || seekToFrame > curFrameIdx + FORWARD_SEEK_THRESHOLD)
+    if (curFrameIdx < 0 || seekToFrame > unsigned(curFrameIdx) + FORWARD_SEEK_THRESHOLD)
     {
       // A seek forward makes sense
       seek = true;
@@ -564,7 +564,7 @@ void playlistItemCompressedVideo::loadRawData(int frameIdx, bool caching)
       {
         // We are reading from a raw annexB file and use ffmpeg for decoding
         QByteArray data;
-        if (readAnnexBFrameCounterCodingOrder >= inputFileAnnexBParser->getNumberPOCs())
+        if (readAnnexBFrameCounterCodingOrder >= 0 && unsigned(readAnnexBFrameCounterCodingOrder) >= inputFileAnnexBParser->getNumberPOCs())
         {
           DEBUG_COMPRESSED("playlistItemCompressedVideo::loadRawData EOF");
         }