diff --git a/docs/spec/appendixes/data_types.adoc b/docs/spec/appendixes/data_types.adoc index ee627c6..ae6aded 100644 --- a/docs/spec/appendixes/data_types.adoc +++ b/docs/spec/appendixes/data_types.adoc @@ -94,6 +94,9 @@ The most current and authoritative list is always maintained in the `libaaruform |80 |DVD Disc Key (decrypted) |81 |DVD CPI_MAI |82 |DVD Title Key (decrypted) -|83 |Flux data -|84 |Bitstream data -|=== +|83 |DVD Identification Data (ID) +|84 |DVD ID Error Detection Code (IED) +|85 |DVD Error Detection Code (EDC) +|86 |DVD Error Correction Code (ECC) Parity of Inner Code (PI) +|87 |DVD Error Correction Code (ECC) Parity of Outer Code (PO) +|88 |DVD Physical Format Information for the second layer diff --git a/include/aaru.h b/include/aaru.h index b979e8c..9d009d8 100644 --- a/include/aaru.h +++ b/include/aaru.h @@ -774,7 +774,7 @@ typedef enum // VideoNow, types 740 to 749 // Iomega, types 750 to 759 - Bernoulli10 = 750, ///< 8"x11" Bernoulli Box disk with 10Mb capacity + Bernoulli10 = 750, ///< 8"x11" Bernoulli Box disk with 10Mb capacity ///< 8"x11" Bernoulli Box disk with 20Mb capacity Bernoulli20 = 751, ///< 5⅓" Bernoulli Box II disk with 20Mb capacity @@ -1060,7 +1060,8 @@ typedef enum MiniDiscUTOC = 71, ///< User TOC, contains fragments, track names, and can be from 1 to 3 sectors of 2336 bytes MiniDiscDTOC = 72, ///< Not entirely clear kind of TOC that only appears on MD-DATA discs DVD_DiscKey_Decrypted = 73, ///< Decrypted DVD disc key, - MaxMediaTag = DVD_DiscKey_Decrypted + DVD_PFI_2ndLayer = 74, ///< DVD Physical Format Information for the second layer + MaxMediaTag = DVD_PFI_2ndLayer } MediaTagType; /** @} */ /* end of MediaTags group */ diff --git a/include/aaruformat/enums.h b/include/aaruformat/enums.h index fe2b3ef..14845a4 100644 --- a/include/aaruformat/enums.h +++ b/include/aaruformat/enums.h @@ -129,7 +129,8 @@ typedef enum DvdSectorIed = 84, ///< DVD ID Error Detection Code (IED) DvdSectorEdc = 85, ///< DVD Error Detection Code (EDC) DvdSectorEccPi = 86, ///< DVD Error Correction Code (ECC) Parity of Inner Code (PI) - DvdEccBlockPo = 87 ///< DVD Error Correction Code (ECC) Parity of Outer Code (PO) + DvdEccBlockPo = 87, ///< DVD Error Correction Code (ECC) Parity of Outer Code (PO) + DvdPfi2ndLayer = 88 ///< DVD Physical Format Information for the second layer } DataType; /** diff --git a/src/helpers.c b/src/helpers.c index 68c1bd3..79e5f38 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -17,8 +17,8 @@ */ #if defined(_WIN32) || defined(_WIN64) -#include #include +#include #endif #include @@ -54,6 +54,8 @@ AARU_LOCAL int32_t AARU_CALL aaruf_get_media_tag_type_for_datatype(const int32_t return CD_TEXT; case DvdPfi: return DVD_PFI; + case DvdPfi2ndLayer: + return DVD_PFI_2ndLayer; case DvdLeadInCmi: return DVD_CMI; case DvdDiscKey: @@ -212,6 +214,8 @@ AARU_LOCAL int32_t AARU_CALL aaruf_get_datatype_for_media_tag_type(const int32_t return CompactDiscLeadInCdText; case DVD_PFI: return DvdPfi; + case DVD_PFI_2ndLayer: + return DvdPfi2ndLayer; case DVD_CMI: return DvdLeadInCmi; case DVD_DiscKey: