diff options
| author | Robert Shih <robertshih@google.com> | 2019-05-06 14:15:12 -0700 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2019-05-06 20:19:42 -0700 |
| commit | a503326e7af89f27c2e65c2c4447e8105547274a (patch) | |
| tree | ba7832aa20f336536c1c0006f3fda4c65dc2a2e7 /drm/mediadrm/plugins/clearkey/hidl/InitDataParser.cpp | |
| parent | 3aa95defac2624f05130927ea3e3f5a56ea617e5 (diff) | |
| download | frameworks_av-a503326e7af89f27c2e65c2c4447e8105547274a.tar.gz frameworks_av-a503326e7af89f27c2e65c2c4447e8105547274a.tar.bz2 frameworks_av-a503326e7af89f27c2e65c2c4447e8105547274a.zip | |
DrmHal: add key status usable_in_future
Bug:116738851
Test: DrmMetrics_test
Change-Id: Ifdd63ce94d3e145840b155a982612ba980cc456d
Diffstat (limited to 'drm/mediadrm/plugins/clearkey/hidl/InitDataParser.cpp')
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/InitDataParser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drm/mediadrm/plugins/clearkey/hidl/InitDataParser.cpp b/drm/mediadrm/plugins/clearkey/hidl/InitDataParser.cpp index 8ebb42bc7b..b988ce03ca 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/InitDataParser.cpp +++ b/drm/mediadrm/plugins/clearkey/hidl/InitDataParser.cpp @@ -51,16 +51,16 @@ Status InitDataParser::parse(const std::vector<uint8_t>& initData, // Build a list of the key IDs std::vector<const uint8_t*> keyIds; - if (mimeType == kIsoBmffVideoMimeType || - mimeType == kIsoBmffAudioMimeType || - mimeType == kCencInitDataFormat) { + if (mimeType == kIsoBmffVideoMimeType.c_str() || + mimeType == kIsoBmffAudioMimeType.c_str() || + mimeType == kCencInitDataFormat.c_str()) { Status res = parsePssh(initData, &keyIds); if (res != Status::OK) { return res; } - } else if (mimeType == kWebmVideoMimeType || - mimeType == kWebmAudioMimeType || - mimeType == kWebmInitDataFormat) { + } else if (mimeType == kWebmVideoMimeType.c_str() || + mimeType == kWebmAudioMimeType.c_str() || + mimeType == kWebmInitDataFormat.c_str()) { // WebM "init data" is just a single key ID if (initData.size() != kKeyIdSize) { return Status::ERROR_DRM_CANNOT_HANDLE; |