diff --git a/README.md b/README.md index 2e33856a78..f73aa24b43 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Shaka Packager supports: - [HLS](https://developer.apple.com/streaming/) - Key systems: - [Widevine](http://www.widevine.com/) - - [Playready](https://www.microsoft.com/playready/)1 + - [PlayReady](https://www.microsoft.com/playready/)1 - [Fairplay](https://developer.apple.com/streaming/fps/)1 - Encryption standards: - [CENC](https://en.wikipedia.org/wiki/MPEG_Common_Encryption) diff --git a/docs/source/documentation.rst b/docs/source/documentation.rst index 9f6fa586e7..f9d7c74377 100644 --- a/docs/source/documentation.rst +++ b/docs/source/documentation.rst @@ -59,7 +59,7 @@ Shaka Packager supports three different types of key providers: - Raw key: keys are provided in command line - Widevine: fetches keys from Widevine key server -- Playready: fetches keys from Playready key server +- PlayReady: fetches keys from PlayReady key server Different key providers cannot be specified at the same time. @@ -69,7 +69,7 @@ Different key providers cannot be specified at the same time. [--enable_widevine_decryption {Widevine Decryption Options}] \ [--enable_raw_key_encryption {Raw Key Encryption Options}] \ [--enable_raw_key_decryption {Raw Key Decryption Options}] \ - [--enable_playready_encryption {Playready Encryption Options}] + [--enable_playready_encryption {PlayReady Encryption Options}] .. include:: /options/general_encryption_options.rst diff --git a/docs/source/library_details.rst b/docs/source/library_details.rst index 06f3d6024f..d47312f832 100644 --- a/docs/source/library_details.rst +++ b/docs/source/library_details.rst @@ -23,7 +23,7 @@ Shaka Packager Library (Continued) .. doxygenstruct:: shaka::WidevineEncryptionParams -.. doxygenstruct:: shaka::PlayreadyEncryptionParams +.. doxygenstruct:: shaka::PlayReadyEncryptionParams .. doxygenstruct:: shaka::RawKeyEncryptionParams diff --git a/docs/source/options/playready_encryption_options.rst b/docs/source/options/playready_encryption_options.rst index 78b5740b20..6b10e8b772 100644 --- a/docs/source/options/playready_encryption_options.rst +++ b/docs/source/options/playready_encryption_options.rst @@ -1,4 +1,4 @@ -Playready encryption options +PlayReady encryption options ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --enable_playready_encryption @@ -7,7 +7,7 @@ Playready encryption options --playready_server_url - Playready packaging server url. + PlayReady packaging server url. --program_identifier @@ -15,11 +15,11 @@ Playready encryption options --playready_key_id - Playready key id in hex. + PlayReady key id in hex. --playready_key - Playready key in hex. + PlayReady key in hex. --ca_file diff --git a/docs/source/tutorials/playready.rst b/docs/source/tutorials/playready.rst index 59eaa6dfc9..ad545db1cd 100644 --- a/docs/source/tutorials/playready.rst +++ b/docs/source/tutorials/playready.rst @@ -1,4 +1,4 @@ -Playready +PlayReady ========= To be completed. diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc index e5a86e8227..9a12916cc1 100644 --- a/packager/app/packager_main.cc +++ b/packager/app/packager_main.cc @@ -290,7 +290,7 @@ base::Optional GetPackagingParams() { ++num_key_providers; } if (FLAGS_enable_playready_encryption) { - encryption_params.key_provider = KeyProvider::kPlayready; + encryption_params.key_provider = KeyProvider::kPlayReady; ++num_key_providers; } if (FLAGS_enable_raw_key_encryption) { @@ -327,8 +327,8 @@ base::Optional GetPackagingParams() { return base::nullopt; break; } - case KeyProvider::kPlayready: { - PlayreadyEncryptionParams& playready = encryption_params.playready; + case KeyProvider::kPlayReady: { + PlayReadyEncryptionParams& playready = encryption_params.playready; playready.key_server_url = FLAGS_playready_server_url; playready.program_identifier = FLAGS_program_identifier; playready.ca_file = FLAGS_ca_file; @@ -376,7 +376,7 @@ base::Optional GetPackagingParams() { return base::nullopt; break; } - case KeyProvider::kPlayready: + case KeyProvider::kPlayReady: case KeyProvider::kNone: break; } diff --git a/packager/app/packager_util.cc b/packager/app/packager_util.cc index cd63a80a6e..cf67e3ccb4 100644 --- a/packager/app/packager_util.cc +++ b/packager/app/packager_util.cc @@ -97,8 +97,8 @@ std::unique_ptr CreateEncryptionKeySource( protection_systems_flags); break; } - case KeyProvider::kPlayready: { - const PlayreadyEncryptionParams& playready = encryption_params.playready; + case KeyProvider::kPlayReady: { + const PlayReadyEncryptionParams& playready = encryption_params.playready; if (!playready.key_server_url.empty() || !playready.program_identifier.empty()) { if (playready.key_server_url.empty() || @@ -175,7 +175,7 @@ std::unique_ptr CreateDecryptionKeySource( break; } case KeyProvider::kNone: - case KeyProvider::kPlayready: + case KeyProvider::kPlayReady: break; } return decryption_key_source; diff --git a/packager/app/protection_system_flags.cc b/packager/app/protection_system_flags.cc index 11951c6dee..4550d0eb67 100644 --- a/packager/app/protection_system_flags.cc +++ b/packager/app/protection_system_flags.cc @@ -16,7 +16,7 @@ DEFINE_bool(generate_common_pssh, "is set and no other pssh flags are specified."); DEFINE_bool(generate_playready_pssh, false, - "When specified, include a Playready PSSH box." + "When specified, include a PlayReady PSSH box." "A playready PSSH is always generated regardless of the value of " "--generate_playready_pssh for --enable_playready_encryption."); DEFINE_bool(generate_widevine_pssh, diff --git a/packager/media/base/playready_key_source.cc b/packager/media/base/playready_key_source.cc index 3ee855a91d..07e2c97183 100644 --- a/packager/media/base/playready_key_source.cc +++ b/packager/media/base/playready_key_source.cc @@ -62,7 +62,7 @@ bool Base64StringToBytes(const std::string& base64_string, PlayReadyKeySource::PlayReadyKeySource(const std::string& server_url, int protection_system_flags) - // Playready PSSH is retrived from Playready server response. + // PlayReady PSSH is retrived from PlayReady server response. : KeySource(protection_system_flags & ~PLAYREADY_PROTECTION_SYSTEM_FLAG), encryption_key_(new EncryptionKey), server_url_(server_url) {} @@ -73,7 +73,7 @@ PlayReadyKeySource::PlayReadyKeySource( const std::string& client_cert_private_key_file, const std::string& client_cert_private_key_password, int protection_system_flags) - // Playready PSSH is retrived from Playready server response. + // PlayReady PSSH is retrived from PlayReady server response. : KeySource(protection_system_flags & ~PLAYREADY_PROTECTION_SYSTEM_FLAG), encryption_key_(new EncryptionKey), server_url_(server_url), diff --git a/packager/media/base/widevine_key_source_unittest.cc b/packager/media/base/widevine_key_source_unittest.cc index a8a22afc3d..b2a02403a1 100644 --- a/packager/media/base/widevine_key_source_unittest.cc +++ b/packager/media/base/widevine_key_source_unittest.cc @@ -244,7 +244,7 @@ class WidevineKeySourceTest : public Test { kPlayReadySystemId, kPlayReadySystemId + arraysize(kPlayReadySystemId)); - // Playready pssh index depends on if there has common pssh box. + // PlayReady pssh index depends on if there has common pssh box. const uint8_t playready_index = 1 + (add_common_pssh_ ? 1 : 0); ASSERT_EQ( playready_system_id, diff --git a/packager/media/public/crypto_params.h b/packager/media/public/crypto_params.h index 7a507a87b8..3d6feccef8 100644 --- a/packager/media/public/crypto_params.h +++ b/packager/media/public/crypto_params.h @@ -18,7 +18,7 @@ namespace shaka { enum class KeyProvider { kNone = 0, kWidevine = 1, - kPlayready = 2, + kPlayReady = 2, kRawKey = 3, }; @@ -61,17 +61,17 @@ struct WidevineEncryptionParams { std::vector group_id; }; -/// Playready encryption parameters. +/// PlayReady encryption parameters. /// Two different modes of playready key acquisition is supported: /// (1) Fetch from a key server. `key_server_url` and `program_identifier` are /// required. The presence of other parameters may be necessary depends /// on server configuration. /// (2) Provide the raw key directly. Both `key_id` and `key` are required. /// We are planning to merge this mode with `RawKeyParams`. -struct PlayreadyEncryptionParams { - /// Playready license / key server URL. +struct PlayReadyEncryptionParams { + /// PlayReady license / key server URL. std::string key_server_url; - /// Playready program identifier. + /// PlayReady program identifier. std::string program_identifier; /// Absolute path to the Certificate Authority file for the server cert in PEM /// format. @@ -114,7 +114,7 @@ struct EncryptionParams { KeyProvider key_provider = KeyProvider::kNone; // Only one of the three fields is valid. WidevineEncryptionParams widevine; - PlayreadyEncryptionParams playready; + PlayReadyEncryptionParams playready; RawKeyParams raw_key; /// When it is true, generate a v1 PSSH box for the common @@ -122,7 +122,7 @@ struct EncryptionParams { /// The flag is default to be true if --enable_raw_key_encryption /// is set and no other pssh flags are specified. bool generate_common_pssh = false; - /// When it is true, include a Playready PSSH box. + /// When it is true, include a PlayReady PSSH box. /// A playready PSSH is always generated regardless of the value of /// --generate_playready_pssh for --enable_playready_encryption. bool generate_playready_pssh = false;