remove internal bSimple boolean

We can check the ID matches the class as we already do on reading.
Matroska-Org · Jan 21, 2024 · a57e6bd · a57e6bd
1 parent 65f7277
commit a57e6bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h
@@ -179,9 +179,8 @@ DECLARE_MKX_MASTER(KaxBlockGroup)
 
 class MATROSKA_DLL_API KaxInternalBlock : public libebml::EbmlBinary {
   public:
-    KaxInternalBlock(const libebml::EbmlCallbacks & classInfo, bool bSimple)
-      :libebml::EbmlBinary(classInfo),
-      bIsSimple(bSimple)
+    KaxInternalBlock(const libebml::EbmlCallbacks & classInfo)
+      :libebml::EbmlBinary(classInfo)
     {}
     KaxInternalBlock(const KaxInternalBlock & ElementToClone);
     ~KaxInternalBlock() override;
@@ -261,7 +260,6 @@ class MATROSKA_DLL_API KaxInternalBlock : public libebml::EbmlBinary {
     std::uint64_t             FirstFrameLocation;
 
     KaxCluster               *ParentCluster{nullptr};
-    bool                      bIsSimple;
 
     libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, ShouldWrite writeFilter = WriteSkipDefault) override;
 };
@@ -280,7 +278,7 @@ class MATROSKA_DLL_API KaxSimpleBlock : public KaxInternalBlock {
     bool                      bIsKeyframe{true};
     bool                      bIsDiscardable{false};
   public:
-    KaxSimpleBlock() :KaxInternalBlock(KaxSimpleBlock::ClassInfos, true) {}
+    KaxSimpleBlock() :KaxInternalBlock(KaxSimpleBlock::ClassInfos) {}
 
     void SetKeyframe(bool b_keyframe) { bIsKeyframe = b_keyframe; }
     void SetDiscardable(bool b_discard) { bIsDiscardable = b_discard; }

diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp
@@ -349,7 +349,7 @@ filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool /* bForceRender
   if (mInvisible)
     *cursor = 0x08;
 
-  if (bIsSimple) {
+  if (EbmlId(*this) == EBML_ID(KaxSimpleBlock)) {
     auto *s = reinterpret_cast<const KaxSimpleBlock*>(this);
     if (s->IsKeyframe())
       *cursor |= 0x80;