From 47a86fb32803a37f03a40e4ea13e1f7db6cd728d Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Thu, 15 May 2014 16:37:05 -0700 Subject: Add ClearKey Utilities Adds some utility functionality that is shared by multiple parts of the ClearKey code. Change-Id: I33a896eb68b2937918f145c9bd27174a119294b9 --- drm/mediadrm/plugins/clearkey/Android.mk | 39 +++++++++++++++++++++++++++ drm/mediadrm/plugins/clearkey/ClearKeyTypes.h | 37 +++++++++++++++++++++++++ drm/mediadrm/plugins/clearkey/Utils.cpp | 30 +++++++++++++++++++++ drm/mediadrm/plugins/clearkey/Utils.h | 32 ++++++++++++++++++++++ 4 files changed, 138 insertions(+) create mode 100644 drm/mediadrm/plugins/clearkey/Android.mk create mode 100644 drm/mediadrm/plugins/clearkey/ClearKeyTypes.h create mode 100644 drm/mediadrm/plugins/clearkey/Utils.cpp create mode 100644 drm/mediadrm/plugins/clearkey/Utils.h (limited to 'drm') diff --git a/drm/mediadrm/plugins/clearkey/Android.mk b/drm/mediadrm/plugins/clearkey/Android.mk new file mode 100644 index 0000000..22613cc --- /dev/null +++ b/drm/mediadrm/plugins/clearkey/Android.mk @@ -0,0 +1,39 @@ +# +# Copyright (C) 2014 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. +# +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + Utils.cpp \ + +LOCAL_C_INCLUDES := \ + bionic \ + frameworks/av/drm/mediadrm/plugins/clearkey \ + frameworks/av/include \ + frameworks/native/include \ + +LOCAL_MODULE := libdrmclearkeyplugin + +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm + +LOCAL_SHARED_LIBRARIES := \ + liblog \ + libstagefright_foundation \ + libutils \ + +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) diff --git a/drm/mediadrm/plugins/clearkey/ClearKeyTypes.h b/drm/mediadrm/plugins/clearkey/ClearKeyTypes.h new file mode 100644 index 0000000..65b434f --- /dev/null +++ b/drm/mediadrm/plugins/clearkey/ClearKeyTypes.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2014 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. + */ + +#ifndef CLEARKEY_TYPES_H_ +#define CLEARKEY_TYPES_H_ + +#include +#include +#include + +namespace clearkeydrm { + +const uint8_t kBlockSize = 16; +typedef uint8_t KeyId[kBlockSize]; +typedef uint8_t Iv[kBlockSize]; + +typedef android::CryptoPlugin::SubSample SubSample; + +typedef android::KeyedVector, + android::Vector > KeyMap; + +} // namespace clearkeydrm + +#endif // CLEARKEY_TYPES_H_ diff --git a/drm/mediadrm/plugins/clearkey/Utils.cpp b/drm/mediadrm/plugins/clearkey/Utils.cpp new file mode 100644 index 0000000..93c643b --- /dev/null +++ b/drm/mediadrm/plugins/clearkey/Utils.cpp @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2014 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 "Utils.h" + +namespace android { + +bool operator<(const Vector &lhs, const Vector &rhs) { + if (lhs.size() < rhs.size()) { + return true; + } else if (lhs.size() > rhs.size()) { + return false; + } + return memcmp((void *)lhs.array(), (void *)rhs.array(), rhs.size()) < 0; +} + +} // namespace android diff --git a/drm/mediadrm/plugins/clearkey/Utils.h b/drm/mediadrm/plugins/clearkey/Utils.h new file mode 100644 index 0000000..2543124 --- /dev/null +++ b/drm/mediadrm/plugins/clearkey/Utils.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2014 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. + */ + +#ifndef CLEARKEY_UTILS_H_ +#define CLEARKEY_UTILS_H_ + +#include + +// Add a comparison operator for this Vector specialization so that it can be +// used as a key in a KeyedVector. +namespace android { + +bool operator<(const Vector &lhs, const Vector &rhs); + +} // namespace android + +#define UNUSED(x) (void)(x); + +#endif // CLEARKEY_UTILS_H_ -- cgit v1.1