Fix a bug with more_rbsp_data detection. Improve logging of SEI types.

IENT · Oct 17, 2023 · 21398f9 · 21398f9
1 parent 3805e69
commit 21398f9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/YUViewLib/src/parser/AVC/SEI/sei_message.cpp b/YUViewLib/src/parser/AVC/SEI/sei_message.cpp
@@ -151,6 +151,12 @@ SEIParsingResult sei_message::parse(reader::SubByteReaderLogging &          read
   // When reading the data above, emulation prevention was alread removed.
   this->payloadReader.disableEmulationPrevention();
 
+  if (payloadNameMap.count(this->payloadType) > 0)
+  {
+    const auto payloadTypeName = payloadNameMap.at(this->payloadType);
+    subLevel.updateSubLevelName("sei_message() - " + payloadTypeName);
+  }
+
   return this->parsePayloadData(false, spsMap, associatedSPS);
 }
 

diff --git a/YUViewLib/src/parser/common/SubByteReader.cpp b/YUViewLib/src/parser/common/SubByteReader.cpp
@@ -275,7 +275,7 @@ bool SubByteReader::more_rbsp_data() const
     posBytes++;
     posBits = 0;
   }
-  else
+  else if (posBits != 0)
   {
     // Check the remainder of the current byte
     unsigned char c = this->byteVector[posBytes];
@@ -300,7 +300,7 @@ bool SubByteReader::more_rbsp_data() const
       return true;
     else if (!terminatingBitFound && (c == 128))
       terminatingBitFound = true;
-    else
+    else if (c != 0)
       return true;
     posBytes++;
   }

diff --git a/YUViewLib/src/parser/common/SubByteReaderLogging.cpp b/YUViewLib/src/parser/common/SubByteReaderLogging.cpp
@@ -160,7 +160,7 @@ SubByteReaderLogging::SubByteReaderLogging(const ByteVector &        inArr,
   }
 }
 
-void SubByteReaderLogging::addLogSubLevel(const std::string name)
+void SubByteReaderLogging::addLogSubLevel(const std::string &name)
 {
   if (!this->currentTreeLevel)
     return;
@@ -169,6 +169,14 @@ void SubByteReaderLogging::addLogSubLevel(const std::string name)
   this->currentTreeLevel = this->itemHierarchy.top()->createChildItem(name);
 }
 
+void SubByteReaderLogging::updateCurrentLevelName(const std::string &name)
+{
+  if (!this->currentTreeLevel)
+    return;
+  assert(!name.empty());
+  this->currentTreeLevel->setName(name);
+}
+
 void SubByteReaderLogging::removeLogSubLevel()
 {
   if (this->itemHierarchy.empty())
@@ -351,4 +359,10 @@ SubByteReaderLoggingSubLevel::~SubByteReaderLoggingSubLevel()
     this->r->removeLogSubLevel();
 }
 
+void SubByteReaderLoggingSubLevel::updateSubLevelName(const std::string &name)
+{
+  if (this->r != nullptr)
+    this->r->updateCurrentLevelName(name);
+}
+
 } // namespace parser::reader
diff --git a/YUViewLib/src/parser/common/SubByteReaderLogging.h b/YUViewLib/src/parser/common/SubByteReaderLogging.h
@@ -93,7 +93,8 @@ class SubByteReaderLogging : public SubByteReader
 
 private:
   friend class SubByteReaderLoggingSubLevel;
-  void addLogSubLevel(std::string name);
+  void addLogSubLevel(const std::string &name);
+  void updateCurrentLevelName(const std::string &name);
   void removeLogSubLevel();
 
   void logExceptionAndThrowError [[noreturn]] (const std::exception &ex, const std::string &when);
@@ -112,6 +113,8 @@ class SubByteReaderLoggingSubLevel
   SubByteReaderLoggingSubLevel(SubByteReaderLogging &reader, std::string name);
   ~SubByteReaderLoggingSubLevel();
 
+  void updateSubLevelName(const std::string &name);
+
 private:
   SubByteReaderLogging *r{};
 };

diff --git a/YUViewLib/src/parser/common/TreeItem.h b/YUViewLib/src/parser/common/TreeItem.h
@@ -70,6 +70,8 @@ class TreeItem : public std::enable_shared_from_this<TreeItem>
     return ss.str();
   }
 
+  void setName(const std::string &name) { this->name = name; }
+
   int getStreamIndex() const
   {
     if (this->streamIndex >= 0)