Skip to content

Commit f7e06a0

Browse files
committed
remove the EbmlBinary::SizeIsValid pure virtual method
We get that information from the EbmlCallbacks.
1 parent 8563b7f commit f7e06a0

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

matroska/KaxBlock.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,6 @@ class MATROSKA_DLL_API KaxInternalBlock : public libebml::EbmlBinary {
184184
{}
185185
KaxInternalBlock(const KaxInternalBlock & ElementToClone);
186186
~KaxInternalBlock() override;
187-
bool SizeIsValid(std::uint64_t size) const override
188-
{
189-
return size >= 4; /// for the moment
190-
}
191187
static inline bool SizeIsValid(std::uint64_t size)
192188
{
193189
return size >= 4; /// for the moment

matroska/KaxSemantic.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "matroska/KaxDefines.h"
2323

2424
namespace libmatroska {
25-
DECLARE_MKX_BINARY_LENGTH(KaxSeekID, 4)
25+
DECLARE_MKX_BINARY(KaxSeekID)
2626
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 4;}
2727
};
2828

@@ -32,28 +32,28 @@ DECLARE_MKX_UINTEGER(KaxSeekPosition)
3232
DECLARE_MKX_MASTER(KaxInfo)
3333
};
3434

35-
DECLARE_MKX_BINARY_LENGTH(KaxSegmentUID, 16)
35+
DECLARE_MKX_BINARY(KaxSegmentUID)
3636
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 16;}
3737
};
3838

3939
DECLARE_MKX_UNISTRING(KaxSegmentFilename)
4040
};
4141

42-
DECLARE_MKX_BINARY_LENGTH(KaxPrevUID, 16)
42+
DECLARE_MKX_BINARY(KaxPrevUID)
4343
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 16;}
4444
};
4545

4646
DECLARE_MKX_UNISTRING(KaxPrevFilename)
4747
};
4848

49-
DECLARE_MKX_BINARY_LENGTH(KaxNextUID, 16)
49+
DECLARE_MKX_BINARY(KaxNextUID)
5050
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 16;}
5151
};
5252

5353
DECLARE_MKX_UNISTRING(KaxNextFilename)
5454
};
5555

56-
DECLARE_MKX_BINARY_LENGTH(KaxSegmentFamily, 16)
56+
DECLARE_MKX_BINARY(KaxSegmentFamily)
5757
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 16;}
5858
};
5959

@@ -391,7 +391,7 @@ DECLARE_MKX_UINTEGER_DEF(KaxVideoAspectRatio)
391391
libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override;
392392
};
393393

394-
DECLARE_MKX_BINARY_LENGTH(KaxVideoColourSpace, 4)
394+
DECLARE_MKX_BINARY(KaxVideoColourSpace)
395395
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 4;}
396396
};
397397

@@ -547,7 +547,7 @@ DECLARE_MKX_UINTEGER(KaxTrickTrackUID)
547547
libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override;
548548
};
549549

550-
DECLARE_MKX_BINARY_LENGTH(KaxTrickTrackSegmentUID, 16)
550+
DECLARE_MKX_BINARY(KaxTrickTrackSegmentUID)
551551
public:
552552
libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override;
553553
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 16;}
@@ -563,7 +563,7 @@ DECLARE_MKX_UINTEGER(KaxTrickMasterTrackUID)
563563
libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override;
564564
};
565565

566-
DECLARE_MKX_BINARY_LENGTH(KaxTrickMasterTrackSegmentUID, 16)
566+
DECLARE_MKX_BINARY(KaxTrickMasterTrackSegmentUID)
567567
public:
568568
libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, const ShouldWrite & writeFilter) override;
569569
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 16;}
@@ -751,7 +751,7 @@ DECLARE_MKX_UINTEGER_DEF(KaxChapterFlagHidden)
751751
DECLARE_MKX_UINTEGER_DEF(KaxChapterFlagEnabled)
752752
};
753753

754-
DECLARE_MKX_BINARY_LENGTH(KaxChapterSegmentUID, 16)
754+
DECLARE_MKX_BINARY(KaxChapterSegmentUID)
755755
static inline bool SizeIsValid(std::uint64_t Size) {return Size == 16;}
756756
};
757757

@@ -1173,7 +1173,7 @@ typedef enum {
11731173
*Indicate what type of content the ChapterAtom contains and might be skipped. It can be used to automatically skip content based on the type.
11741174
If a `ChapterAtom` is inside a `ChapterAtom` that has a `ChapterSkipType` set, it **MUST NOT** have a `ChapterSkipType` or have a `ChapterSkipType` with the same value as it's parent `ChapterAtom`.
11751175
If the `ChapterAtom` doesn't contain a `ChapterTimeEnd`, the value of the `ChapterSkipType` is only valid until the next `ChapterAtom` with a `ChapterSkipType` value or the end of the file.
1176-
1176+
11771177
*/
11781178
typedef enum {
11791179
MATROSKA_CHAPTERSKIPTYPE_NO_SKIPPING = 0, // Content which should not be skipped.

0 commit comments

Comments
 (0)