Merge "DRM VTS Vendor module for widevine" into oc-dev

am: 2b49e7c4ec

Change-Id: I90d94e3a306a9c6da1e15b38798fd94d03d4be76
This commit is contained in:
Jeff Tinker
2017-03-31 05:33:22 +00:00
committed by android-build-merger
5 changed files with 243 additions and 0 deletions

View File

@@ -234,3 +234,4 @@ include vendor/widevine/libwvdrmengine/cdm/Android.mk
include vendor/widevine/libwvdrmengine/level3/Android.mk
include vendor/widevine/libwvdrmengine/mediacrypto/Android.mk
include vendor/widevine/libwvdrmengine/mediadrm/Android.mk
include vendor/widevine/libwvdrmengine/vts/vendor_module/Android.mk

View File

@@ -0,0 +1,39 @@
# ----------------------------------------------------------------
# Builds libvtswidevine.so
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES := \
hardware/interfaces/drm/1.0/vts/functional \
vendor/widevine/libwvdrmengine/cdm/include \
vendor/widevine/libwvdrmengine/cdm/core/include \
vendor/widevine/libwvdrmengine/cdm/core/test \
system/libhidl/base/include \
system/core/base/include \
system/libvintf/include \
LOCAL_SRC_FILES := \
factory.cpp \
vts_module.cpp \
../../cdm/core/test/url_request.cpp \
../../cdm/core/test/license_request.cpp \
../../cdm/core/test/http_socket.cpp \
LOCAL_STATIC_LIBRARIES := \
libgtest \
libcdm \
libcdm_utils \
libcrypto_static
LOCAL_SHARED_LIBRARIES := \
libcutils \
liblog \
libssl \
libutils \
LOCAL_MODULE := libvtswidevine
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)

View File

@@ -0,0 +1,28 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "drm_hal_vendor_module_api.h"
#include "vts_module.h"
namespace widevine_vts {
extern "C" {
DrmHalVTSVendorModule *vendorModuleFactory() {
return new WidevineVTSVendorModule_V1();
}
};
}; // namespace widevine_vts

View File

@@ -0,0 +1,127 @@
//
// Copyright 2017 Google Inc. All Rights Reserved.
//
#include "gtest/gtest.h"
#include "license_request.h"
#include "string_conversions.h"
#include "url_request.h"
#include "utils/Log.h"
#include "vts_module.h"
using std::array;
using std::map;
using std::string;
using std::vector;
using wvcdm::a2b_hex;
using wvcdm::b2a_hex;
using wvcdm::LicenseRequest;
using wvcdm::UrlRequest;
namespace widevine_vts {
const int kHttpOk = 200;
vector<uint8_t> WidevineVTSVendorModule_V1::getUUID() {
uint8_t uuid[16] = {
0xED,0xEF,0x8B,0xA9,0x79,0xD6,0x4A,0xCE,
0xA3,0xC8,0x27,0xDC,0xD5,0x1D,0x21,0xED
};
return vector<uint8_t>(uuid, uuid + sizeof(uuid));
}
void LogResponseError(const string& message, int http_status_code) {
ALOGD("HTTP Status code = %d", http_status_code);
ALOGD("HTTP response(%d): %s", message.size(), b2a_hex(message).c_str());
}
vector<uint8_t> WidevineVTSVendorModule_V1::handleProvisioningRequest(
const vector<uint8_t>& provisioning_request,
const string& server_url) {
// Use secure connection and chunk transfer coding.
UrlRequest url_request(server_url);
EXPECT_TRUE(url_request.is_connected()) << "Fail to connect to "
<< server_url;
url_request.PostCertRequestInQueryString(toString(provisioning_request));
string reply;
EXPECT_TRUE(url_request.GetResponse(&reply));
int http_status_code = url_request.GetStatusCode(reply);
if (kHttpOk != http_status_code) {
LogResponseError(reply, http_status_code);
}
EXPECT_EQ(kHttpOk, http_status_code);
vector<uint8_t> result(reply.begin(), reply.end());
return vector<uint8_t>(result);
}
vector<uint8_t> WidevineVTSVendorModule_V1::handleKeyRequest(
const vector<uint8_t>&key_request, const string& server_url) {
// Use secure connection and chunk transfer coding.
UrlRequest url_request(server_url);
EXPECT_TRUE(url_request.is_connected()) << "Fail to connect to "
<< server_url;
url_request.PostRequest(toString(key_request));
string reply;
EXPECT_TRUE(url_request.GetResponse(&reply));
int httpStatusCode = url_request.GetStatusCode(reply);
if (httpStatusCode != kHttpOk) {
LogResponseError(reply, httpStatusCode);
}
EXPECT_EQ(httpStatusCode, kHttpOk);
string drm_msg;
if (kHttpOk == httpStatusCode) {
LicenseRequest lic_request;
lic_request.GetDrmMessage(reply, drm_msg);
ALOGV("HTTP response body: (%u bytes)", drm_msg.size());
}
vector<uint8_t> result(drm_msg.begin(), drm_msg.end());
return result;
}
vector<DrmHalVTSVendorModule_V1::ContentConfiguration>
WidevineVTSVendorModule_V1::getContentConfigurations() {
vector<DrmHalVTSVendorModule_V1::ContentConfiguration> configurations;
{
const string serverUrl = "https://proxy.uat.widevine.com/proxy";
const vector<uint8_t> initData = a2b_hex(
"00000042" // blob size
"70737368" // "pssh"
"00000000" // flags
"edef8ba979d64acea3c827dcd51d21ed" // Widevine system id
"00000022" // pssh data size
"08011a0d7769646576696e655f746573" // pssh data...
"74220f73747265616d696e675f636c69"
"7031");
vector<uint8_t> keyIdVec;
const vector<uint8_t> keyId = a2b_hex("371EA35E1A985D75D198A7F41020DC23");
const vector<uint8_t> keyValue = a2b_hex("371EA35E1A985D75D198A7F41020DC23");
const vector<DrmHalVTSVendorModule_V1::ContentConfiguration::Key> keys = {
{
.isSecure = false,
.keyId = keyId,
.keyValue = keyValue
}
};
ContentConfiguration config = {
.name = "UAT-asset1",
.serverUrl = serverUrl,
.initData = initData,
.mimeType = "cenc",
.optionalParameters = map<string, string>(),
.keys = keys
};
configurations.push_back(config);
};
return configurations;
}
}; // namespace widevine_vts

View File

@@ -0,0 +1,48 @@
//
// Copyright 2017 Google Inc. All Rights Reserved.
//
#ifndef WIDEVINE_VENDOR_VTS_MODULE
#define WIDEVINE_VENDOR_VTS_MODULE
#include <utils/Log.h>
#include "drm_hal_vendor_module_api.h"
using std::vector;
/**
* Define the DrmHalVTSVendorModule_V1 for Widevine. Refer to
* drm_hal_vendor_module_api.h for more details.
*/
namespace widevine_vts {
class WidevineVTSVendorModule_V1 : public DrmHalVTSVendorModule_V1 {
public:
WidevineVTSVendorModule_V1() {}
virtual ~WidevineVTSVendorModule_V1() {}
virtual vector<uint8_t> getUUID();
virtual vector<uint8_t> handleProvisioningRequest(const vector<uint8_t>&
provisioningRequest, const std::string& url);
virtual vector<uint8_t> handleKeyRequest(const vector<uint8_t>&
keyRequest, const std::string& serverUrl);
virtual std::vector<ContentConfiguration> getContentConfigurations();
// TODO: change to "widevine" when HAL service is available
virtual std::string getServiceName() {return "default";}
private:
WidevineVTSVendorModule_V1(const WidevineVTSVendorModule_V1&) = delete;
void operator=(const WidevineVTSVendorModule_V1&) = delete;
std::string toString(std::vector<uint8_t> vector) {
return std::string(vector.begin(), vector.end());
}
};
}; // namespace widevine_vts
#endif //WIDEVINE_VENDOR_VTS_MODULE