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

KEYFORMATVERSION should be 1 for HLS Widevine key system 

Change-Id: I59c7852727b803bcdb1e49d33e36fca7f51e507c
This commit is contained in:
KongQun Yang 2017-06-16 12:21:52 -07:00
parent 7c48cc4800
commit abbd495ad4
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packager/hls/base/simple_hls_notifier.cc
View File

@ -178,9 +178,9 @@ bool HandleWidevineKeyFormats(
return false;
}
// This format does not have a key id field.
NotifyEncryptionToMediaPlaylist(
encryption_method, key_uri_data,
std::vector<uint8_t>(), iv, "com.widevine", "", media_playlist);
NotifyEncryptionToMediaPlaylist(encryption_method, key_uri_data,
std::vector<uint8_t>(), iv, "com.widevine",
"1", media_playlist);
}
std::string pssh_as_string(

13
packager/hls/base/simple_hls_notifier_unittest.cc
View File

@ -689,14 +689,13 @@ TEST_F(SimpleHlsNotifierTest, WidevineNotifyEncryptionUpdateEmptyIv) {
widevine_system_id_.size());
pssh_info.add_key_id(any_key_id);
EXPECT_CALL(*mock_media_playlist,
AddEncryptionInfo(
_, StrEq("data:text/plain;base64," + expected_json_base64),
StrEq(""), StrEq(""), StrEq("com.widevine"), StrEq("1")));
EXPECT_CALL(
*mock_media_playlist,
AddEncryptionInfo(_,
StrEq("data:text/plain;base64," + expected_json_base64),
StrEq(""),
StrEq(""), StrEq("com.widevine"), _));
EXPECT_CALL(*mock_media_playlist,
AddEncryptionInfo(
_,
StrEq("data:text/plain;base64,"
@ -704,7 +703,7 @@ TEST_F(SimpleHlsNotifierTest, WidevineNotifyEncryptionUpdateEmptyIv) {
"LqXnWSs6jyCfc1R0h7QAAACsSEBEiM0QRIjNEESIzRBEiM0QaDHNvb"
"WVwcm92aWRlciIJY29udGVudGlk"),
StrEq("0x11223344112233441122334411223344"), StrEq(""),
StrEq("urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"), _));
StrEq("urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"), StrEq("1")));
std::vector<uint8_t> pssh_as_vec = pssh_info.CreateBox();
std::string pssh_in_string(pssh_as_vec.begin(), pssh_as_vec.end());
std::string base_64_encoded_pssh;