Source release v3.5.0
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
|
||||
#include "buffer_reader.h"
|
||||
#include "jsmn.h"
|
||||
#include "license_protocol.pb.h"
|
||||
#include "log.h"
|
||||
#include "properties.h"
|
||||
#include "string_conversions.h"
|
||||
@@ -15,10 +14,6 @@
|
||||
|
||||
namespace {
|
||||
const char kKeyFormatVersionsSeparator = '/';
|
||||
const char kColon = ':';
|
||||
const char kDoubleQuote = '\"';
|
||||
const char kLeftBracket = '[';
|
||||
const char kRightBracket = ']';
|
||||
const std::string kBase64String = "base64,";
|
||||
const uint32_t kFourCcCbc1 = 0x63626331;
|
||||
const uint32_t kFourCcCbcs = 0x63626373;
|
||||
@@ -594,4 +589,19 @@ std::vector<std::string> InitializationData::ExtractKeyFormatVersions(
|
||||
return versions;
|
||||
}
|
||||
|
||||
// Extract the key id of the group master key used to generate sublicense data.
|
||||
// Returns an empty string if not defined.
|
||||
const std::string InitializationData::ExtractGroupMasterKeyId() const {
|
||||
if (!is_cenc_) {
|
||||
return "";
|
||||
}
|
||||
|
||||
WidevinePsshData cenc_header;
|
||||
if (!cenc_header.ParseFromString(data_)) {
|
||||
return "";
|
||||
}
|
||||
|
||||
return cenc_header.group_master_key_id();
|
||||
}
|
||||
|
||||
} // namespace wvcdm
|
||||
|
||||
Reference in New Issue
Block a user