Source release 18.1.0
This commit is contained in:
@@ -34,7 +34,6 @@ namespace wvcdm {
|
||||
|
||||
using drm_metrics::DistributionMetric;
|
||||
using drm_metrics::WvCdmMetrics;
|
||||
using metrics::EngineMetrics;
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -153,7 +152,7 @@ class WvCdmEngineTest : public WvCdmEnginePreProvTest {
|
||||
WvCdmEngineTest() {}
|
||||
|
||||
void SetUp() override {
|
||||
WvCdmTestBase::SetUp();
|
||||
WvCdmEnginePreProvTest::SetUp();
|
||||
session_opened_ = false;
|
||||
WvCdmEnginePreProvTest::OpenSession();
|
||||
}
|
||||
@@ -275,12 +274,12 @@ class WvCdmEngineTest : public WvCdmEnginePreProvTest {
|
||||
engine_metrics.Serialize(&metrics_proto);
|
||||
bool has_request_type = false;
|
||||
for (int i = 0; i < metrics_proto.session_metrics_size(); i++) {
|
||||
WvCdmMetrics::SessionMetrics session_metrics =
|
||||
const WvCdmMetrics::SessionMetrics& session_metrics =
|
||||
metrics_proto.session_metrics(i);
|
||||
for (int j = 0;
|
||||
j < session_metrics.cdm_session_license_request_latency_ms_size();
|
||||
j++) {
|
||||
DistributionMetric latency_distribution =
|
||||
const DistributionMetric& latency_distribution =
|
||||
session_metrics.cdm_session_license_request_latency_ms(j);
|
||||
if (latency_distribution.attributes().key_request_type() ==
|
||||
key_request_type &&
|
||||
@@ -362,7 +361,7 @@ TEST_F(WvCdmEngineTest, BaseIsoBmffMessageTest) {
|
||||
TEST_F(WvCdmEngineTest, DISABLED_BaseWebmMessageTest) {
|
||||
// Extract the key ID from the PSSH box.
|
||||
InitializationData extractor(CENC_INIT_DATA_FORMAT, binary_key_id());
|
||||
KeyId key_id_unwrapped = extractor.data();
|
||||
const KeyId& key_id_unwrapped = extractor.data();
|
||||
GenerateKeyRequest(key_id_unwrapped, kWebmMimeType);
|
||||
GetKeyRequestResponse(config_.license_server(), config_.client_auth());
|
||||
}
|
||||
@@ -383,7 +382,7 @@ TEST_F(WvCdmEngineTest, ReturnsLicenseTypeDetailStreaming) {
|
||||
TEST_F(WvCdmEngineTest, DISABLED_NormalDecryptionWebm) {
|
||||
// Extract the key ID from the PSSH box.
|
||||
InitializationData extractor(CENC_INIT_DATA_FORMAT, binary_key_id());
|
||||
KeyId key_id_unwrapped = extractor.data();
|
||||
const KeyId& key_id_unwrapped = extractor.data();
|
||||
GenerateKeyRequest(key_id_unwrapped, kWebmMimeType);
|
||||
VerifyNewKeyResponse(config_.license_server(), config_.client_auth());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user