From c83cf3f4f4c12e95cff8c8a8e737a7dd859b7dcf Mon Sep 17 00:00:00 2001 From: nilaoda Date: Tue, 29 Nov 2022 10:46:01 +0800 Subject: [PATCH] `PLAYREADY` -> `CENC` --- src/N_m3u8DL-RE.Common/Enum/EncryptMethod.cs | 1 - src/N_m3u8DL-RE.Common/Resource/StaticText.cs | 6 +++--- src/N_m3u8DL-RE.Parser/Extractor/MSSExtractor.cs | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/N_m3u8DL-RE.Common/Enum/EncryptMethod.cs b/src/N_m3u8DL-RE.Common/Enum/EncryptMethod.cs index 5316c1e..319a466 100644 --- a/src/N_m3u8DL-RE.Common/Enum/EncryptMethod.cs +++ b/src/N_m3u8DL-RE.Common/Enum/EncryptMethod.cs @@ -15,7 +15,6 @@ namespace N_m3u8DL_RE.Common.Enum SAMPLE_AES_CTR, CENC, CHACHA20, - PLAYREADY, UNKNOWN } } diff --git a/src/N_m3u8DL-RE.Common/Resource/StaticText.cs b/src/N_m3u8DL-RE.Common/Resource/StaticText.cs index 475cc74..d6cc83f 100644 --- a/src/N_m3u8DL-RE.Common/Resource/StaticText.cs +++ b/src/N_m3u8DL-RE.Common/Resource/StaticText.cs @@ -288,9 +288,9 @@ namespace N_m3u8DL_RE.Common.Resource ), ["cmd_customHLSMethod"] = new TextContainer ( - zhCN: "指定HLS加密方式 (AES_128|AES_128_ECB|CENC|PLAYREADY|CHACHA20|NONE|SAMPLE_AES|SAMPLE_AES_CTR|UNKNOWN)", - zhTW: "指定HLS加密方式 (AES_128|AES_128_ECB|CENC|PLAYREADY|CHACHA20|NONE|SAMPLE_AES|SAMPLE_AES_CTR|UNKNOWN)", - enUS: "Set HLS encryption method (AES_128|AES_128_ECB|CENC|PLAYREADY|CHACHA20|NONE|SAMPLE_AES|SAMPLE_AES_CTR|UNKNOWN)" + zhCN: "指定HLS加密方式 (AES_128|AES_128_ECB|CENC|CHACHA20|NONE|SAMPLE_AES|SAMPLE_AES_CTR|UNKNOWN)", + zhTW: "指定HLS加密方式 (AES_128|AES_128_ECB|CENC|CHACHA20|NONE|SAMPLE_AES|SAMPLE_AES_CTR|UNKNOWN)", + enUS: "Set HLS encryption method (AES_128|AES_128_ECB|CENC|CHACHA20|NONE|SAMPLE_AES|SAMPLE_AES_CTR|UNKNOWN)" ), ["cmd_customHLSKey"] = new TextContainer ( diff --git a/src/N_m3u8DL-RE.Parser/Extractor/MSSExtractor.cs b/src/N_m3u8DL-RE.Parser/Extractor/MSSExtractor.cs index 9fafbde..692dfa5 100644 --- a/src/N_m3u8DL-RE.Parser/Extractor/MSSExtractor.cs +++ b/src/N_m3u8DL-RE.Parser/Extractor/MSSExtractor.cs @@ -28,7 +28,7 @@ namespace N_m3u8DL_RE.Parser.Extractor //////////////////////////////////////// - private static EncryptMethod DEFAULT_METHOD = EncryptMethod.PLAYREADY; + private static EncryptMethod DEFAULT_METHOD = EncryptMethod.CENC; public ExtractorType ExtractorType => ExtractorType.MSS;