aaru-dps/Aaru.Decryption
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Decryption.git synced 2025-12-16 19:24:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix naming.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-05 01:52:47 +01:00
parent a85f1ce494
commit 39d11a44ca
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DVD/CSS.cs
View File

@@ -721,7 +721,7 @@ public class CSS
static bool IsEncrypted(byte? cmi, byte[]? key, IReadOnlyList<byte> sector) static bool IsEncrypted(byte? cmi, byte[]? key, IReadOnlyList<byte> sector)
{ {
// Only MPEG packets can be encrypted. // Only MPEG packets can be encrypted.
if(!MPEG.IsMpegPacket(sector)) if(!Mpeg.IsMpegPacket(sector))
return false; return false;
// The CMI tells us the sector is not encrypted. // The CMI tells us the sector is not encrypted.
@@ -733,9 +733,9 @@ public class CSS
return false; return false;
// These packet types cannot be encrypted // These packet types cannot be encrypted
if(sector[17] == (byte)MPEG.Mpeg2StreamId.SystemHeader || if(sector[17] == (byte)Mpeg.Mpeg2StreamId.SystemHeader ||
sector[17] == (byte)MPEG.Mpeg2StreamId.PaddingStream || sector[17] == (byte)Mpeg.Mpeg2StreamId.PaddingStream ||
sector[17] == (byte)MPEG.Mpeg2StreamId.PrivateStream2) sector[17] == (byte)Mpeg.Mpeg2StreamId.PrivateStream2)
return false; return false;
// MPEG Packetized Elementary Stream scrambling control value // MPEG Packetized Elementary Stream scrambling control value

14
DVD/MPEG.cs
View File

@@ -46,7 +46,7 @@ using System.Runtime.InteropServices;
namespace Aaru.Decryption.DVD; namespace Aaru.Decryption.DVD;
[SuppressMessage("ReSharper", "UnusedType.Global")] [SuppressMessage("ReSharper", "UnusedType.Global")]
public class MPEG public class Mpeg
{ {
#region Mpeg2StreamId enum #region Mpeg2StreamId enum
@@ -61,7 +61,7 @@ public class MPEG
PrivateStream2 = 0xBF, PrivateStream2 = 0xBF,
EcmStream = 0xF0, EcmStream = 0xF0,
EmmStream = 0xF1, EmmStream = 0xF1,
ItuTRecH222_0_or_IsoIec13818_1AnnexA_or_IsoIec13818_6DsmccStream = 0xF2, ItuTRecH222_0_Or_IsoIec13818_1AnnexA_Or_IsoIec13818_6DsmccStream = 0xF2,
IsoIec13522Stream = 0xF3, IsoIec13522Stream = 0xF3,
ItuTRecH222_1TypeA = 0xF4, ItuTRecH222_1TypeA = 0xF4,
ItuTRecH222_1TypeB = 0xF5, ItuTRecH222_1TypeB = 0xF5,
@@ -155,13 +155,13 @@ public class MPEG
public struct MpegHeader public struct MpegHeader
{ {
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] startCode; public byte[] StartCode;
public byte packIdentifier; public byte PackIdentifier;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
public byte[] scrBlock; public byte[] SCRBlock;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] programMuxRateBlock; public byte[] ProgramMuxRateBlock;
byte packStuffingLengthBlock; byte _packStuffingLengthBlock;
} }
#endregion #endregion