From 988c4758008d96b7d0ca1905bab5784c48e6825c Mon Sep 17 00:00:00 2001 From: Rebecca Wallander Date: Wed, 13 Jan 2021 22:01:13 +0100 Subject: [PATCH 1/3] Add missing title keys to the resume file --- Metadata/Resume.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Metadata/Resume.cs b/Metadata/Resume.cs index 379fb34ca..828b0d5dc 100644 --- a/Metadata/Resume.cs +++ b/Metadata/Resume.cs @@ -60,6 +60,8 @@ namespace Aaru.CommonTypes.Metadata public List BadSubchannels; [XmlArrayItem("Extent")] public ExtentType[] BlankExtents; + [XmlArrayItem("Block")] + public List MissingTitleKeys; [XmlArrayItem("DumpTry")] public List Tries; From 1e523e4a7a6095acbb8f21b925e7ca1f7de25c6b Mon Sep 17 00:00:00 2001 From: Rebecca Wallander Date: Wed, 13 Jan 2021 22:20:06 +0100 Subject: [PATCH 2/3] Add DVD CSS related enums --- Enums/Images.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Enums/Images.cs b/Enums/Images.cs index b83fae94d..c51202d24 100644 --- a/Enums/Images.cs +++ b/Enums/Images.cs @@ -109,7 +109,11 @@ namespace Aaru.CommonTypes.Enums /// DVD sector copyright information DvdCmi = 12, /// Floppy address mark (contents depend on underlying floppy format) - FloppyAddressMark = 13 + FloppyAddressMark = 13, + /// DVD sector title key, 5 bytes + DvdTitleKey = 14, + /// Decrypted DVD sector title key, 5 bytes + DvdTitleKeyDecrypted = 15 } /// Metadata present for each media. @@ -264,7 +268,9 @@ namespace Aaru.CommonTypes.Enums /// User TOC, contains fragments, track names, and can be from 1 to 3 sectors of 2336 bytes MiniDiscUTOC = 71, /// Not entirely clear kind of TOC that only appears on MD-DATA discs - MiniDiscDTOC = 72 + MiniDiscDTOC = 72, + /// Decrypted DVD disc key + DVD_DiscKey_Decrypted = 73 } /// Enumeration of media types defined in CICM metadata From 3e80b5d9f203e1331d056cb9c6edde21507e8a34 Mon Sep 17 00:00:00 2001 From: Rebecca Wallander Date: Fri, 15 Jan 2021 22:21:51 +0100 Subject: [PATCH 3/3] Update copyright --- Enums/Images.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Enums/Images.cs b/Enums/Images.cs index c51202d24..f7a0a91db 100644 --- a/Enums/Images.cs +++ b/Enums/Images.cs @@ -34,6 +34,7 @@ // // ---------------------------------------------------------------------------- // Copyright © 2011-2021 Natalia Portillo +// Copyright © 2020-2021 Rebecca Wallander // ****************************************************************************/ using System;