Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Playready to PlayReady. 

Change-Id: I11e0b0a0cc32aec574804e7cb02291dc3174357c
This commit is contained in:
Haoming Chen 2018-04-20 11:06:36 -07:00
parent aa4b573342
commit dddbb19701
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -16,7 +16,7 @@ Shaka Packager supports:
- [HLS](https://developer.apple.com/streaming/) - [HLS](https://developer.apple.com/streaming/)
- Key systems: - Key systems:
- [Widevine](http://www.widevine.com/) - [Widevine](http://www.widevine.com/)
- [Playready](https://www.microsoft.com/playready/)<sup>1</sup> - [PlayReady](https://www.microsoft.com/playready/)<sup>1</sup>
- [Fairplay](https://developer.apple.com/streaming/fps/)<sup>1</sup> - [Fairplay](https://developer.apple.com/streaming/fps/)<sup>1</sup>
- Encryption standards: - Encryption standards:
- [CENC](https://en.wikipedia.org/wiki/MPEG_Common_Encryption) - [CENC](https://en.wikipedia.org/wiki/MPEG_Common_Encryption)

4
docs/source/documentation.rst
View File

@ -59,7 +59,7 @@ Shaka Packager supports three different types of key providers:
- Raw key: keys are provided in command line - Raw key: keys are provided in command line
- Widevine: fetches keys from Widevine key server - 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. 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_widevine_decryption {Widevine Decryption Options}] \
[--enable_raw_key_encryption {Raw Key Encryption Options}] \ [--enable_raw_key_encryption {Raw Key Encryption Options}] \
[--enable_raw_key_decryption {Raw Key Decryption 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 .. include:: /options/general_encryption_options.rst

2
docs/source/library_details.rst
View File

@ -23,7 +23,7 @@ Shaka Packager Library (Continued)
.. doxygenstruct:: shaka::WidevineEncryptionParams .. doxygenstruct:: shaka::WidevineEncryptionParams
.. doxygenstruct:: shaka::PlayreadyEncryptionParams .. doxygenstruct:: shaka::PlayReadyEncryptionParams
.. doxygenstruct:: shaka::RawKeyEncryptionParams .. doxygenstruct:: shaka::RawKeyEncryptionParams

8
docs/source/options/playready_encryption_options.rst
View File

@ -1,4 +1,4 @@
Playready encryption options PlayReady encryption options
^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--enable_playready_encryption --enable_playready_encryption
@ -7,7 +7,7 @@ Playready encryption options
--playready_server_url <url> --playready_server_url <url>
Playready packaging server url. PlayReady packaging server url.
--program_identifier <program_identifier> --program_identifier <program_identifier>
@ -15,11 +15,11 @@ Playready encryption options
--playready_key_id <hex> --playready_key_id <hex>
Playready key id in hex. PlayReady key id in hex.
--playready_key <hex> --playready_key <hex>
Playready key in hex. PlayReady key in hex.
--ca_file <file path> --ca_file <file path>

2
docs/source/tutorials/playready.rst
View File

@ -1,4 +1,4 @@
Playready PlayReady
========= =========
To be completed. To be completed.

8
packager/app/packager_main.cc
View File

@ -290,7 +290,7 @@ base::Optional<PackagingParams> GetPackagingParams() {
++num_key_providers; ++num_key_providers;
} }
if (FLAGS_enable_playready_encryption) { if (FLAGS_enable_playready_encryption) {
encryption_params.key_provider = KeyProvider::kPlayready; encryption_params.key_provider = KeyProvider::kPlayReady;
++num_key_providers; ++num_key_providers;
} }
if (FLAGS_enable_raw_key_encryption) { if (FLAGS_enable_raw_key_encryption) {
@ -327,8 +327,8 @@ base::Optional<PackagingParams> GetPackagingParams() {
return base::nullopt; return base::nullopt;
break; break;
} }
case KeyProvider::kPlayready: { case KeyProvider::kPlayReady: {
PlayreadyEncryptionParams& playready = encryption_params.playready; PlayReadyEncryptionParams& playready = encryption_params.playready;
playready.key_server_url = FLAGS_playready_server_url; playready.key_server_url = FLAGS_playready_server_url;
playready.program_identifier = FLAGS_program_identifier; playready.program_identifier = FLAGS_program_identifier;
playready.ca_file = FLAGS_ca_file; playready.ca_file = FLAGS_ca_file;
@ -376,7 +376,7 @@ base::Optional<PackagingParams> GetPackagingParams() {
return base::nullopt; return base::nullopt;
break; break;
} }
case KeyProvider::kPlayready: case KeyProvider::kPlayReady:
case KeyProvider::kNone: case KeyProvider::kNone:
break; break;
} }

6
packager/app/packager_util.cc
View File

@ -97,8 +97,8 @@ std::unique_ptr<KeySource> CreateEncryptionKeySource(
protection_systems_flags); protection_systems_flags);
break; break;
} }
case KeyProvider::kPlayready: { case KeyProvider::kPlayReady: {
const PlayreadyEncryptionParams& playready = encryption_params.playready; const PlayReadyEncryptionParams& playready = encryption_params.playready;
if (!playready.key_server_url.empty() || if (!playready.key_server_url.empty() ||
!playready.program_identifier.empty()) { !playready.program_identifier.empty()) {
if (playready.key_server_url.empty() || if (playready.key_server_url.empty() ||
@ -175,7 +175,7 @@ std::unique_ptr<KeySource> CreateDecryptionKeySource(
break; break;
} }
case KeyProvider::kNone: case KeyProvider::kNone:
case KeyProvider::kPlayready: case KeyProvider::kPlayReady:
break; break;
} }
return decryption_key_source; return decryption_key_source;

2
packager/app/protection_system_flags.cc
View File

@ -16,7 +16,7 @@ DEFINE_bool(generate_common_pssh,
"is set and no other pssh flags are specified."); "is set and no other pssh flags are specified.");
DEFINE_bool(generate_playready_pssh, DEFINE_bool(generate_playready_pssh,
false, 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 " "A playready PSSH is always generated regardless of the value of "
"--generate_playready_pssh for --enable_playready_encryption."); "--generate_playready_pssh for --enable_playready_encryption.");
DEFINE_bool(generate_widevine_pssh, DEFINE_bool(generate_widevine_pssh,

4
packager/media/base/playready_key_source.cc
View File

@ -62,7 +62,7 @@ bool Base64StringToBytes(const std::string& base64_string,
PlayReadyKeySource::PlayReadyKeySource(const std::string& server_url, PlayReadyKeySource::PlayReadyKeySource(const std::string& server_url,
int protection_system_flags) 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), : KeySource(protection_system_flags & ~PLAYREADY_PROTECTION_SYSTEM_FLAG),
encryption_key_(new EncryptionKey), encryption_key_(new EncryptionKey),
server_url_(server_url) {} 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_file,
const std::string& client_cert_private_key_password, const std::string& client_cert_private_key_password,
int protection_system_flags) 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), : KeySource(protection_system_flags & ~PLAYREADY_PROTECTION_SYSTEM_FLAG),
encryption_key_(new EncryptionKey), encryption_key_(new EncryptionKey),
server_url_(server_url), server_url_(server_url),

2
packager/media/base/widevine_key_source_unittest.cc
View File

@ -244,7 +244,7 @@ class WidevineKeySourceTest : public Test {
kPlayReadySystemId, kPlayReadySystemId,
kPlayReadySystemId + arraysize(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); const uint8_t playready_index = 1 + (add_common_pssh_ ? 1 : 0);
ASSERT_EQ( ASSERT_EQ(
playready_system_id, playready_system_id,

14
packager/media/public/crypto_params.h
View File

@ -18,7 +18,7 @@ namespace shaka {
enum class KeyProvider { enum class KeyProvider {
kNone = 0, kNone = 0,
kWidevine = 1, kWidevine = 1,
kPlayready = 2, kPlayReady = 2,
kRawKey = 3, kRawKey = 3,
}; };
@ -61,17 +61,17 @@ struct WidevineEncryptionParams {
std::vector<uint8_t> group_id; std::vector<uint8_t> group_id;
}; };
/// Playready encryption parameters. /// PlayReady encryption parameters.
/// Two different modes of playready key acquisition is supported: /// Two different modes of playready key acquisition is supported:
/// (1) Fetch from a key server. `key_server_url` and `program_identifier` are /// (1) Fetch from a key server. `key_server_url` and `program_identifier` are
/// required. The presence of other parameters may be necessary depends /// required. The presence of other parameters may be necessary depends
/// on server configuration. /// on server configuration.
/// (2) Provide the raw key directly. Both `key_id` and `key` are required. /// (2) Provide the raw key directly. Both `key_id` and `key` are required.
/// We are planning to merge this mode with `RawKeyParams`. /// We are planning to merge this mode with `RawKeyParams`.
struct PlayreadyEncryptionParams { struct PlayReadyEncryptionParams {
/// Playready license / key server URL. /// PlayReady license / key server URL.
std::string key_server_url; std::string key_server_url;
/// Playready program identifier. /// PlayReady program identifier.
std::string program_identifier; std::string program_identifier;
/// Absolute path to the Certificate Authority file for the server cert in PEM /// Absolute path to the Certificate Authority file for the server cert in PEM
/// format. /// format.
@ -114,7 +114,7 @@ struct EncryptionParams {
KeyProvider key_provider = KeyProvider::kNone; KeyProvider key_provider = KeyProvider::kNone;
// Only one of the three fields is valid. // Only one of the three fields is valid.
WidevineEncryptionParams widevine; WidevineEncryptionParams widevine;
PlayreadyEncryptionParams playready; PlayReadyEncryptionParams playready;
RawKeyParams raw_key; RawKeyParams raw_key;
/// When it is true, generate a v1 PSSH box for the common /// 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 /// The flag is default to be true if --enable_raw_key_encryption
/// is set and no other pssh flags are specified. /// is set and no other pssh flags are specified.
bool generate_common_pssh = false; 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 /// A playready PSSH is always generated regardless of the value of
/// --generate_playready_pssh for --enable_playready_encryption. /// --generate_playready_pssh for --enable_playready_encryption.
bool generate_playready_pssh = false; bool generate_playready_pssh = false;