Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "cas: retrieve detailed error from descrambler"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-15 20:41:05 +00:00
committed by Android (Google) Code Review
parent 96a76b8f29 521f69550c
commit 758ebb9aee
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cas/1.0/default/Android.bp
View File

@@ -23,10 +23,10 @@ cc_defaults {
"libhidlmemory",
"libhidltransport",
"liblog",
"libstagefright_foundation",
"libutils",
],
header_libs: [
"libstagefright_foundation_headers",
"media_plugin_headers",
],
}

6
cas/1.0/default/DescramblerImpl.cpp
View File

@@ -20,6 +20,7 @@
#include <hidlmemory/mapping.h>
#include <media/cas/DescramblerAPI.h>
#include <media/hardware/CryptoAPI.h>
#include <media/stagefright/foundation/AString.h>
#include <media/stagefright/foundation/AUtils.h>
#include <utils/Log.h>
@@ -177,6 +178,7 @@ Return<void> DescramblerImpl::descramble(
// Casting hidl SubSample to DescramblerPlugin::SubSample, but need
// to ensure structs are actually idential
AString detailedError;
int32_t result = holder->descramble(
dstBuffer.type != BufferType::SHARED_MEMORY,
(DescramblerPlugin::ScramblingControl)scramblingControl,
@@ -186,10 +188,10 @@ Return<void> DescramblerImpl::descramble(
srcOffset,
dstPtr,
dstOffset,
NULL);
&detailedError);
holder.reset();
_hidl_cb(toStatus(result >= 0 ? OK : result), result, NULL);
_hidl_cb(toStatus(result >= 0 ? OK : result), result, detailedError.c_str());
return Void();
}