]> granicus.if.org Git - libmatroska/commitdiff
add ContentEncAESSettings and AESSettingsCipherMode
authorSteve Lhomme <robux4@ycbcr.xyz>
Sat, 1 Jun 2019 06:49:18 +0000 (08:49 +0200)
committerSteve Lhomme <robux4@ycbcr.xyz>
Mon, 22 Jun 2020 04:59:14 +0000 (06:59 +0200)
matroska/KaxSemantic.h
src/KaxSemantic.cpp

index 65084fbe0eb7746f683e91fdd43c79d64ee77fbb..6c08287a13930660c3cfb647a02f41db3cbee2c8 100644 (file)
@@ -608,6 +608,12 @@ DECLARE_MKX_UINTEGER(KaxContentEncAlgo)
 DECLARE_MKX_BINARY (KaxContentEncKeyID)
 };
 
+DECLARE_MKX_MASTER(KaxContentEncAESSettings)
+};
+
+DECLARE_MKX_UINTEGER(KaxAESSettingsCipherMode)
+};
+
 DECLARE_MKX_BINARY (KaxContentSignature)
 };
 
index cab1ac2189e0cec4ddac8a96308d1ffc9a2b12b9..b8f7e2e40158c6ef37083825f8aa21020095ee0e 100644 (file)
@@ -549,6 +549,7 @@ DEFINE_MKX_BINARY (KaxContentCompSettings, 0x4255, 2, KaxContentCompression, "Co
 DEFINE_START_SEMANTIC(KaxContentEncryption)
 DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncAlgo)
 DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncKeyID)
+DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncAESSettings)
 DEFINE_SEMANTIC_ITEM(false, true, KaxContentSignature)
 DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigKeyID)
 DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigAlgo)
@@ -558,6 +559,13 @@ DEFINE_END_SEMANTIC(KaxContentEncryption)
 DEFINE_MKX_MASTER(KaxContentEncryption, 0x5035, 2, KaxContentEncoding, "ContentEncryption")
 DEFINE_MKX_UINTEGER_DEF(KaxContentEncAlgo, 0x47E1, 2, KaxContentEncryption, "ContentEncAlgo", 0)
 DEFINE_MKX_BINARY (KaxContentEncKeyID, 0x47E2, 2, KaxContentEncryption, "ContentEncKeyID")
+
+DEFINE_START_SEMANTIC(KaxContentEncAESSettings)
+DEFINE_SEMANTIC_ITEM(true, true, KaxAESSettingsCipherMode)
+DEFINE_END_SEMANTIC(KaxContentEncAESSettings)
+
+DEFINE_MKX_MASTER(KaxContentEncAESSettings, 0x47E7, 2, KaxContentEncryption, "ContentEncAESSettings")
+DEFINE_MKX_UINTEGER(KaxAESSettingsCipherMode, 0x47E8, 2, KaxContentEncAESSettings, "AESSettingsCipherMode")
 DEFINE_MKX_BINARY (KaxContentSignature, 0x47E3, 2, KaxContentEncryption, "ContentSignature")
 DEFINE_MKX_BINARY (KaxContentSigKeyID, 0x47E4, 2, KaxContentEncryption, "ContentSigKeyID")
 DEFINE_MKX_UINTEGER_DEF(KaxContentSigAlgo, 0x47E5, 2, KaxContentEncryption, "ContentSigAlgo", 0)