Revert "codec2 hal: Codec2ConfigurableClient to take HIDL or AID..."
Revert submission 20667833
Reason for revert: Build broken (b/262039340)
Reverted Changes:
I4aacbfea2:codec2 hal: move directories around
I4239c654e:codec2 hal: Codec2ConfigurableClient to take HIDL ...
Change-Id: Ibe4c48cf49013ace615f891992eb126c788ff117
diff --git a/media/codec2/hidl/client/client.cpp b/media/codec2/hidl/client/client.cpp
index 09452c4..0acf7d7 100644
--- a/media/codec2/hidl/client/client.cpp
+++ b/media/codec2/hidl/client/client.cpp
@@ -24,7 +24,6 @@
#include <C2Config.h> // for C2StreamUsageTuning
#include <C2PlatformSupport.h>
-#include <android/binder_auto_utils.h>
#include <android/hardware/media/bufferpool/2.0/IClientManager.h>
#include <android/hardware/media/c2/1.0/IComponent.h>
#include <android/hardware/media/c2/1.0/IComponentInterface.h>
@@ -33,15 +32,6 @@
#include <android/hardware/media/c2/1.0/IConfigurable.h>
#include <android/hidl/manager/1.2/IServiceManager.h>
-#include <aidl/android/hardware/media/c2/FieldSupportedValues.h>
-#include <aidl/android/hardware/media/c2/FieldSupportedValuesQuery.h>
-#include <aidl/android/hardware/media/c2/FieldSupportedValuesQueryResult.h>
-#include <aidl/android/hardware/media/c2/IComponent.h>
-#include <aidl/android/hardware/media/c2/IComponentInterface.h>
-#include <aidl/android/hardware/media/c2/IComponentStore.h>
-#include <aidl/android/hardware/media/c2/IConfigurable.h>
-#include <aidl/android/hardware/media/c2/ParamDescriptor.h>
-
#include <android-base/properties.h>
#include <bufferpool/ClientManager.h>
#include <codec2/hidl/1.0/types.h>
@@ -57,6 +47,7 @@
#include <system/window.h> // for NATIVE_WINDOW_QUERY_*
#include <media/stagefright/foundation/ADebug.h> // for asString(status_t)
+
#include <deque>
#include <iterator>
#include <limits>
@@ -74,6 +65,11 @@
using ::android::hardware::Return;
using ::android::hardware::Void;
+using namespace ::android::hardware::media::c2::V1_1;
+using namespace ::android::hardware::media::c2::V1_1::utils;
+using namespace ::android::hardware::media::bufferpool::V2_0;
+using namespace ::android::hardware::media::bufferpool::V2_0::implementation;
+
using HGraphicBufferProducer1 = ::android::hardware::graphics::bufferqueue::
V1_0::IGraphicBufferProducer;
using HGraphicBufferProducer2 = ::android::hardware::graphics::bufferqueue::
@@ -84,13 +80,6 @@
V2_0::utils::H2BGraphicBufferProducer;
using ::android::hardware::media::c2::V1_2::SurfaceSyncObj;
-namespace bufferpool_hidl = ::android::hardware::media::bufferpool::V2_0;
-namespace c2_aidl = ::aidl::android::hardware::media::c2;
-namespace c2_hidl_base = ::android::hardware::media::c2;
-namespace c2_hidl = ::android::hardware::media::c2::V1_2;
-
-using c2_hidl::utils::operator<<;
-
namespace /* unnamed */ {
// c2_status_t value that corresponds to hwbinder transaction failure.
@@ -265,43 +254,15 @@
return sCaches;
}
};
-// Codec2ConfigurableClient::HidlImpl
-struct Codec2ConfigurableClient::HidlImpl : public Codec2ConfigurableClient::ImplBase {
- typedef c2_hidl::IConfigurable Base;
+// Codec2ConfigurableClient
- // base cannot be null.
- explicit HidlImpl(const sp<Base>& base);
+const C2String& Codec2ConfigurableClient::getName() const {
+ return mName;
+}
- const C2String& getName() const override {
- return mName;
- }
-
- c2_status_t query(
- const std::vector<C2Param*>& stackParams,
- const std::vector<C2Param::Index> &heapParamIndices,
- c2_blocking_t mayBlock,
- std::vector<std::unique_ptr<C2Param>>* const heapParams) const override;
-
- c2_status_t config(
- const std::vector<C2Param*> ¶ms,
- c2_blocking_t mayBlock,
- std::vector<std::unique_ptr<C2SettingResult>>* const failures) override;
-
- c2_status_t querySupportedParams(
- std::vector<std::shared_ptr<C2ParamDescriptor>>* const params
- ) const override;
-
- c2_status_t querySupportedValues(
- std::vector<C2FieldSupportedValuesQuery>& fields,
- c2_blocking_t mayBlock) const override;
-
-private:
- sp<Base> mBase;
- const C2String mName;
-};
-
-Codec2ConfigurableClient::HidlImpl::HidlImpl(const sp<Base>& base)
+Codec2ConfigurableClient::Codec2ConfigurableClient(
+ const sp<IConfigurable>& base)
: mBase{base},
mName{[base]() -> C2String {
C2String outName;
@@ -313,12 +274,12 @@
}()} {
}
-c2_status_t Codec2ConfigurableClient::HidlImpl::query(
+c2_status_t Codec2ConfigurableClient::query(
const std::vector<C2Param*> &stackParams,
const std::vector<C2Param::Index> &heapParamIndices,
c2_blocking_t mayBlock,
std::vector<std::unique_ptr<C2Param>>* const heapParams) const {
- hidl_vec<c2_hidl::ParamIndex> indices(
+ hidl_vec<ParamIndex> indices(
stackParams.size() + heapParamIndices.size());
size_t numIndices = 0;
for (C2Param* const& stackParam : stackParams) {
@@ -326,12 +287,12 @@
LOG(WARNING) << "query -- null stack param encountered.";
continue;
}
- indices[numIndices++] = static_cast<c2_hidl::ParamIndex>(stackParam->index());
+ indices[numIndices++] = static_cast<ParamIndex>(stackParam->index());
}
size_t numStackIndices = numIndices;
for (const C2Param::Index& index : heapParamIndices) {
indices[numIndices++] =
- static_cast<c2_hidl::ParamIndex>(static_cast<uint32_t>(index));
+ static_cast<ParamIndex>(static_cast<uint32_t>(index));
}
indices.resize(numIndices);
if (heapParams) {
@@ -342,7 +303,7 @@
indices,
mayBlock == C2_MAY_BLOCK,
[&status, &numStackIndices, &stackParams, heapParams](
- c2_hidl::Status s, const c2_hidl::Params& p) {
+ Status s, const Params& p) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK && status != C2_BAD_INDEX) {
LOG(DEBUG) << "query -- call failed: "
@@ -350,7 +311,7 @@
return;
}
std::vector<C2Param*> paramPointers;
- if (!c2_hidl::utils::parseParamsBlob(¶mPointers, p)) {
+ if (!parseParamsBlob(¶mPointers, p)) {
LOG(ERROR) << "query -- error while parsing params.";
status = C2_CORRUPTED;
return;
@@ -410,12 +371,12 @@
return status;
}
-c2_status_t Codec2ConfigurableClient::HidlImpl::config(
+c2_status_t Codec2ConfigurableClient::config(
const std::vector<C2Param*> ¶ms,
c2_blocking_t mayBlock,
std::vector<std::unique_ptr<C2SettingResult>>* const failures) {
- c2_hidl::Params hidlParams;
- if (!c2_hidl::utils::createParamsBlob(&hidlParams, params)) {
+ Params hidlParams;
+ if (!createParamsBlob(&hidlParams, params)) {
LOG(ERROR) << "config -- bad input.";
return C2_TRANSACTION_FAILED;
}
@@ -424,9 +385,9 @@
hidlParams,
mayBlock == C2_MAY_BLOCK,
[&status, ¶ms, failures](
- c2_hidl::Status s,
- const hidl_vec<c2_hidl::SettingResult> f,
- const c2_hidl::Params& o) {
+ Status s,
+ const hidl_vec<SettingResult> f,
+ const Params& o) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK && status != C2_BAD_INDEX) {
LOG(DEBUG) << "config -- call failed: "
@@ -434,14 +395,14 @@
}
size_t i = failures->size();
failures->resize(i + f.size());
- for (const c2_hidl::SettingResult& sf : f) {
- if (!c2_hidl::utils::objcpy(&(*failures)[i++], sf)) {
+ for (const SettingResult& sf : f) {
+ if (!objcpy(&(*failures)[i++], sf)) {
LOG(ERROR) << "config -- "
<< "invalid SettingResult returned.";
return;
}
}
- if (!c2_hidl::utils::updateParamsFromBlob(params, o)) {
+ if (!updateParamsFromBlob(params, o)) {
LOG(ERROR) << "config -- "
<< "failed to parse returned params.";
status = C2_CORRUPTED;
@@ -454,7 +415,7 @@
return status;
}
-c2_status_t Codec2ConfigurableClient::HidlImpl::querySupportedParams(
+c2_status_t Codec2ConfigurableClient::querySupportedParams(
std::vector<std::shared_ptr<C2ParamDescriptor>>* const params) const {
// TODO: Cache and query properly!
c2_status_t status;
@@ -462,8 +423,8 @@
std::numeric_limits<uint32_t>::min(),
std::numeric_limits<uint32_t>::max(),
[&status, params](
- c2_hidl::Status s,
- const hidl_vec<c2_hidl::ParamDescriptor>& p) {
+ Status s,
+ const hidl_vec<ParamDescriptor>& p) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
LOG(DEBUG) << "querySupportedParams -- call failed: "
@@ -472,8 +433,8 @@
}
size_t i = params->size();
params->resize(i + p.size());
- for (const c2_hidl::ParamDescriptor& sp : p) {
- if (!c2_hidl::utils::objcpy(&(*params)[i++], sp)) {
+ for (const ParamDescriptor& sp : p) {
+ if (!objcpy(&(*params)[i++], sp)) {
LOG(ERROR) << "querySupportedParams -- "
<< "invalid returned ParamDescriptor.";
return;
@@ -487,12 +448,12 @@
return status;
}
-c2_status_t Codec2ConfigurableClient::HidlImpl::querySupportedValues(
+c2_status_t Codec2ConfigurableClient::querySupportedValues(
std::vector<C2FieldSupportedValuesQuery>& fields,
c2_blocking_t mayBlock) const {
- hidl_vec<c2_hidl::FieldSupportedValuesQuery> inFields(fields.size());
+ hidl_vec<FieldSupportedValuesQuery> inFields(fields.size());
for (size_t i = 0; i < fields.size(); ++i) {
- if (!c2_hidl::utils::objcpy(&inFields[i], fields[i])) {
+ if (!objcpy(&inFields[i], fields[i])) {
LOG(ERROR) << "querySupportedValues -- bad input";
return C2_TRANSACTION_FAILED;
}
@@ -503,8 +464,8 @@
inFields,
mayBlock == C2_MAY_BLOCK,
[&status, &inFields, &fields](
- c2_hidl::Status s,
- const hidl_vec<c2_hidl::FieldSupportedValuesQueryResult>& r) {
+ Status s,
+ const hidl_vec<FieldSupportedValuesQueryResult>& r) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
LOG(DEBUG) << "querySupportedValues -- call failed: "
@@ -519,7 +480,7 @@
return;
}
for (size_t i = 0; i < fields.size(); ++i) {
- if (!c2_hidl::utils::objcpy(&fields[i], inFields[i], r[i])) {
+ if (!objcpy(&fields[i], inFields[i], r[i])) {
LOG(ERROR) << "querySupportedValues -- "
"invalid returned value.";
status = C2_CORRUPTED;
@@ -534,135 +495,14 @@
return status;
}
-// Codec2ConfigurableClient::AidlImpl
-
-struct Codec2ConfigurableClient::AidlImpl : public Codec2ConfigurableClient::ImplBase {
- typedef c2_aidl::IConfigurable Base;
-
- // base cannot be null.
- explicit AidlImpl(const std::shared_ptr<Base>& base);
-
- const C2String& getName() const override {
- return mName;
- }
-
- c2_status_t query(
- const std::vector<C2Param*>& stackParams,
- const std::vector<C2Param::Index> &heapParamIndices,
- c2_blocking_t mayBlock,
- std::vector<std::unique_ptr<C2Param>>* const heapParams) const override;
-
- c2_status_t config(
- const std::vector<C2Param*> ¶ms,
- c2_blocking_t mayBlock,
- std::vector<std::unique_ptr<C2SettingResult>>* const failures) override;
-
- c2_status_t querySupportedParams(
- std::vector<std::shared_ptr<C2ParamDescriptor>>* const params
- ) const override;
-
- c2_status_t querySupportedValues(
- std::vector<C2FieldSupportedValuesQuery>& fields,
- c2_blocking_t mayBlock) const override;
-
-private:
- std::shared_ptr<Base> mBase;
- const C2String mName;
-};
-
-Codec2ConfigurableClient::AidlImpl::AidlImpl(const std::shared_ptr<Base>& base)
- : mBase{base},
- mName{[base]() -> C2String {
- std::string outName;
- ndk::ScopedAStatus status = base->getName(&outName);
- return status.isOk() ? outName : "";
- }()} {
-}
-
-c2_status_t Codec2ConfigurableClient::AidlImpl::query(
- const std::vector<C2Param*> &stackParams,
- const std::vector<C2Param::Index> &heapParamIndices,
- c2_blocking_t mayBlock,
- std::vector<std::unique_ptr<C2Param>>* const heapParams) const {
- (void)stackParams, (void)heapParamIndices, (void)mayBlock, (void)heapParams;
- // TODO: implementation
- return C2_OMITTED;
-}
-
-c2_status_t Codec2ConfigurableClient::AidlImpl::config(
- const std::vector<C2Param*> ¶ms,
- c2_blocking_t mayBlock,
- std::vector<std::unique_ptr<C2SettingResult>>* const failures) {
- (void)params, (void)mayBlock, (void)failures;
- // TODO: implementation
- return C2_OMITTED;
-}
-
-c2_status_t Codec2ConfigurableClient::AidlImpl::querySupportedParams(
- std::vector<std::shared_ptr<C2ParamDescriptor>>* const params) const {
- (void)params;
- // TODO: implementation
- return C2_OMITTED;
-}
-
-c2_status_t Codec2ConfigurableClient::AidlImpl::querySupportedValues(
- std::vector<C2FieldSupportedValuesQuery>& fields,
- c2_blocking_t mayBlock) const {
- (void)fields, (void)mayBlock;
- // TODO: implementation
- return C2_OMITTED;
-}
-
-// Codec2ConfigurableClient
-
-Codec2ConfigurableClient::Codec2ConfigurableClient(const sp<HidlBase> &hidlBase)
- : mImpl(new Codec2ConfigurableClient::HidlImpl(hidlBase)) {
-}
-
-Codec2ConfigurableClient::Codec2ConfigurableClient(
- const std::shared_ptr<AidlBase> &aidlBase)
- : mImpl(new Codec2ConfigurableClient::AidlImpl(aidlBase)) {
-}
-
-const C2String& Codec2ConfigurableClient::getName() const {
- return mImpl->getName();
-}
-
-c2_status_t Codec2ConfigurableClient::query(
- const std::vector<C2Param*>& stackParams,
- const std::vector<C2Param::Index> &heapParamIndices,
- c2_blocking_t mayBlock,
- std::vector<std::unique_ptr<C2Param>>* const heapParams) const {
- return mImpl->query(stackParams, heapParamIndices, mayBlock, heapParams);
-}
-
-c2_status_t Codec2ConfigurableClient::config(
- const std::vector<C2Param*> ¶ms,
- c2_blocking_t mayBlock,
- std::vector<std::unique_ptr<C2SettingResult>>* const failures) {
- return mImpl->config(params, mayBlock, failures);
-}
-
-c2_status_t Codec2ConfigurableClient::querySupportedParams(
- std::vector<std::shared_ptr<C2ParamDescriptor>>* const params) const {
- return mImpl->querySupportedParams(params);
-}
-
-c2_status_t Codec2ConfigurableClient::querySupportedValues(
- std::vector<C2FieldSupportedValuesQuery>& fields,
- c2_blocking_t mayBlock) const {
- return mImpl->querySupportedValues(fields, mayBlock);
-}
-
-
// Codec2Client::Component::HidlListener
-struct Codec2Client::Component::HidlListener : public c2_hidl::IComponentListener {
+struct Codec2Client::Component::HidlListener : public IComponentListener {
std::weak_ptr<Component> component;
std::weak_ptr<Listener> base;
- virtual Return<void> onWorkDone(const c2_hidl::WorkBundle& workBundle) override {
+ virtual Return<void> onWorkDone(const WorkBundle& workBundle) override {
std::list<std::unique_ptr<C2Work>> workItems;
- if (!c2_hidl::utils::objcpy(&workItems, workBundle)) {
+ if (!objcpy(&workItems, workBundle)) {
LOG(DEBUG) << "onWorkDone -- received corrupted WorkBundle.";
return Void();
}
@@ -681,12 +521,12 @@
}
virtual Return<void> onTripped(
- const hidl_vec<c2_hidl::SettingResult>& settingResults) override {
+ const hidl_vec<SettingResult>& settingResults) override {
std::vector<std::shared_ptr<C2SettingResult>> c2SettingResults(
settingResults.size());
for (size_t i = 0; i < settingResults.size(); ++i) {
std::unique_ptr<C2SettingResult> c2SettingResult;
- if (!c2_hidl::utils::objcpy(&c2SettingResult, settingResults[i])) {
+ if (!objcpy(&c2SettingResult, settingResults[i])) {
LOG(DEBUG) << "onTripped -- received corrupted SettingResult.";
return Void();
}
@@ -700,13 +540,13 @@
return Void();
}
- virtual Return<void> onError(c2_hidl::Status s, uint32_t errorCode) override {
+ virtual Return<void> onError(Status s, uint32_t errorCode) override {
LOG(DEBUG) << "onError --"
<< " status = " << s
<< ", errorCode = " << errorCode
<< ".";
if (std::shared_ptr<Listener> listener = base.lock()) {
- listener->onError(component, s == c2_hidl::Status::OK ?
+ listener->onError(component, s == Status::OK ?
errorCode : static_cast<c2_status_t>(s));
} else {
LOG(DEBUG) << "onError -- listener died.";
@@ -772,11 +612,11 @@
Codec2Client::Codec2Client(sp<Base> const& base,
size_t serviceIndex)
: Configurable{
- [base]() -> sp<c2_hidl::IConfigurable> {
- Return<sp<c2_hidl::IConfigurable>> transResult =
+ [base]() -> sp<IConfigurable> {
+ Return<sp<IConfigurable>> transResult =
base->getConfigurable();
return transResult.isOk() ?
- static_cast<sp<c2_hidl::IConfigurable>>(transResult) :
+ static_cast<sp<IConfigurable>>(transResult) :
nullptr;
}()
},
@@ -784,11 +624,11 @@
mBase1_1{Base1_1::castFrom(base)},
mBase1_2{Base1_2::castFrom(base)},
mServiceIndex{serviceIndex} {
- Return<sp<bufferpool_hidl::IClientManager>> transResult = base->getPoolClientManager();
+ Return<sp<IClientManager>> transResult = base->getPoolClientManager();
if (!transResult.isOk()) {
LOG(ERROR) << "getPoolClientManager -- transaction failed.";
} else {
- mHostPoolManager = static_cast<sp<bufferpool_hidl::IClientManager>>(transResult);
+ mHostPoolManager = static_cast<sp<IClientManager>>(transResult);
}
}
@@ -825,10 +665,10 @@
transStatus = mBase1_2->createComponent_1_2(
name,
hidlListener,
- bufferpool_hidl::implementation::ClientManager::getInstance(),
+ ClientManager::getInstance(),
[&status, component, hidlListener](
- c2_hidl::Status s,
- const sp<c2_hidl::IComponent>& c) {
+ Status s,
+ const sp<IComponent>& c) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
return;
@@ -841,10 +681,10 @@
transStatus = mBase1_1->createComponent_1_1(
name,
hidlListener,
- bufferpool_hidl::implementation::ClientManager::getInstance(),
+ ClientManager::getInstance(),
[&status, component, hidlListener](
- c2_hidl::Status s,
- const sp<c2_hidl_base::V1_1::IComponent>& c) {
+ Status s,
+ const sp<IComponent>& c) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
return;
@@ -856,10 +696,10 @@
transStatus = mBase1_0->createComponent(
name,
hidlListener,
- bufferpool_hidl::implementation::ClientManager::getInstance(),
+ ClientManager::getInstance(),
[&status, component, hidlListener](
- c2_hidl::Status s,
- const sp<c2_hidl_base::V1_0::IComponent>& c) {
+ Status s,
+ const sp<hardware::media::c2::V1_0::IComponent>& c) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
return;
@@ -907,8 +747,8 @@
Return<void> transStatus = mBase1_0->createInterface(
name,
[&status, interface](
- c2_hidl::Status s,
- const sp<c2_hidl::IComponentInterface>& i) {
+ Status s,
+ const sp<IComponentInterface>& i) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
return;
@@ -938,8 +778,8 @@
c2_status_t status;
Return<void> transStatus = mBase1_0->createInputSurface(
[&status, inputSurface](
- c2_hidl::Status s,
- const sp<c2_hidl::IInputSurface>& i) {
+ Status s,
+ const sp<IInputSurface>& i) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
return;
@@ -965,16 +805,16 @@
std::vector<C2Component::Traits> traits;
std::string const& serviceName = getServiceName();
Return<void> transStatus = mBase1_0->listComponents(
- [&traits, &serviceName](c2_hidl::Status s,
- const hidl_vec<c2_hidl::IComponentStore::ComponentTraits>& t) {
- if (s != c2_hidl::Status::OK) {
+ [&traits, &serviceName](Status s,
+ const hidl_vec<IComponentStore::ComponentTraits>& t) {
+ if (s != Status::OK) {
LOG(DEBUG) << "_listComponents -- call failed: "
<< static_cast<c2_status_t>(s) << ".";
return;
}
traits.resize(t.size());
for (size_t i = 0; i < t.size(); ++i) {
- if (!c2_hidl::utils::objcpy(&traits[i], t[i])) {
+ if (!objcpy(&traits[i], t[i])) {
LOG(ERROR) << "_listComponents -- corrupted output.";
return;
}
@@ -1006,14 +846,14 @@
// should reflect the HAL API.
struct SimpleParamReflector : public C2ParamReflector {
virtual std::unique_ptr<C2StructDescriptor> describe(C2Param::CoreIndex coreIndex) const {
- hidl_vec<c2_hidl::ParamIndex> indices(1);
- indices[0] = static_cast<c2_hidl::ParamIndex>(coreIndex.coreIndex());
+ hidl_vec<ParamIndex> indices(1);
+ indices[0] = static_cast<ParamIndex>(coreIndex.coreIndex());
std::unique_ptr<C2StructDescriptor> descriptor;
Return<void> transStatus = mBase->getStructDescriptors(
indices,
[&descriptor](
- c2_hidl::Status s,
- const hidl_vec<c2_hidl::StructDescriptor>& sd) {
+ Status s,
+ const hidl_vec<StructDescriptor>& sd) {
c2_status_t status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
LOG(DEBUG) << "SimpleParamReflector -- "
@@ -1031,7 +871,7 @@
descriptor.reset();
return;
}
- if (!c2_hidl::utils::objcpy(&descriptor, sd[0])) {
+ if (!objcpy(&descriptor, sd[0])) {
LOG(DEBUG) << "SimpleParamReflector -- "
"getStructDescriptors() returned "
"corrupted data.";
@@ -1359,11 +1199,11 @@
// Codec2Client::Interface
Codec2Client::Interface::Interface(const sp<Base>& base)
: Configurable{
- [base]() -> sp<c2_hidl::IConfigurable> {
- Return<sp<c2_hidl::IConfigurable>> transResult =
+ [base]() -> sp<IConfigurable> {
+ Return<sp<IConfigurable>> transResult =
base->getConfigurable();
return transResult.isOk() ?
- static_cast<sp<c2_hidl::IConfigurable>>(transResult) :
+ static_cast<sp<IConfigurable>>(transResult) :
nullptr;
}()
},
@@ -1373,17 +1213,17 @@
// Codec2Client::Component
Codec2Client::Component::Component(const sp<Base>& base)
: Configurable{
- [base]() -> sp<c2_hidl::IConfigurable> {
- Return<sp<c2_hidl::IComponentInterface>> transResult1 =
+ [base]() -> sp<IConfigurable> {
+ Return<sp<IComponentInterface>> transResult1 =
base->getInterface();
if (!transResult1.isOk()) {
return nullptr;
}
- Return<sp<c2_hidl::IConfigurable>> transResult2 =
- static_cast<sp<c2_hidl::IComponentInterface>>(transResult1)->
+ Return<sp<IConfigurable>> transResult2 =
+ static_cast<sp<IComponentInterface>>(transResult1)->
getConfigurable();
return transResult2.isOk() ?
- static_cast<sp<c2_hidl::IConfigurable>>(transResult2) :
+ static_cast<sp<IConfigurable>>(transResult2) :
nullptr;
}()
},
@@ -1396,17 +1236,17 @@
Codec2Client::Component::Component(const sp<Base1_1>& base)
: Configurable{
- [base]() -> sp<c2_hidl::IConfigurable> {
- Return<sp<c2_hidl::IComponentInterface>> transResult1 =
+ [base]() -> sp<IConfigurable> {
+ Return<sp<IComponentInterface>> transResult1 =
base->getInterface();
if (!transResult1.isOk()) {
return nullptr;
}
- Return<sp<c2_hidl::IConfigurable>> transResult2 =
- static_cast<sp<c2_hidl::IComponentInterface>>(transResult1)->
+ Return<sp<IConfigurable>> transResult2 =
+ static_cast<sp<IComponentInterface>>(transResult1)->
getConfigurable();
return transResult2.isOk() ?
- static_cast<sp<c2_hidl::IConfigurable>>(transResult2) :
+ static_cast<sp<IConfigurable>>(transResult2) :
nullptr;
}()
},
@@ -1419,17 +1259,17 @@
Codec2Client::Component::Component(const sp<Base1_2>& base)
: Configurable{
- [base]() -> sp<c2_hidl::IConfigurable> {
- Return<sp<c2_hidl::IComponentInterface>> transResult1 =
+ [base]() -> sp<IConfigurable> {
+ Return<sp<IComponentInterface>> transResult1 =
base->getInterface();
if (!transResult1.isOk()) {
return nullptr;
}
- Return<sp<c2_hidl::IConfigurable>> transResult2 =
- static_cast<sp<c2_hidl::IComponentInterface>>(transResult1)->
+ Return<sp<IConfigurable>> transResult2 =
+ static_cast<sp<IComponentInterface>>(transResult1)->
getConfigurable();
return transResult2.isOk() ?
- static_cast<sp<c2_hidl::IConfigurable>>(transResult2) :
+ static_cast<sp<IConfigurable>>(transResult2) :
nullptr;
}()
},
@@ -1451,9 +1291,9 @@
Return<void> transStatus = mBase1_0->createBlockPool(
static_cast<uint32_t>(id),
[&status, blockPoolId, configurable](
- c2_hidl::Status s,
+ Status s,
uint64_t pId,
- const sp<c2_hidl::IConfigurable>& c) {
+ const sp<IConfigurable>& c) {
status = static_cast<c2_status_t>(s);
configurable->reset();
if (status != C2_OK) {
@@ -1473,13 +1313,13 @@
c2_status_t Codec2Client::Component::destroyBlockPool(
C2BlockPool::local_id_t localId) {
- Return<c2_hidl::Status> transResult = mBase1_0->destroyBlockPool(
+ Return<Status> transResult = mBase1_0->destroyBlockPool(
static_cast<uint64_t>(localId));
if (!transResult.isOk()) {
LOG(ERROR) << "destroyBlockPool -- transaction failed.";
return C2_TRANSACTION_FAILED;
}
- return static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transResult));
+ return static_cast<c2_status_t>(static_cast<Status>(transResult));
}
void Codec2Client::Component::handleOnWorkDone(
@@ -1490,18 +1330,18 @@
c2_status_t Codec2Client::Component::queue(
std::list<std::unique_ptr<C2Work>>* const items) {
- c2_hidl::WorkBundle workBundle;
+ WorkBundle workBundle;
if (!objcpy(&workBundle, *items, mBufferPoolSender.get())) {
LOG(ERROR) << "queue -- bad input.";
return C2_TRANSACTION_FAILED;
}
- Return<c2_hidl::Status> transStatus = mBase1_0->queue(workBundle);
+ Return<Status> transStatus = mBase1_0->queue(workBundle);
if (!transStatus.isOk()) {
LOG(ERROR) << "queue -- transaction failed.";
return C2_TRANSACTION_FAILED;
}
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "queue -- call failed: " << status << ".";
}
@@ -1515,13 +1355,13 @@
c2_status_t status;
Return<void> transStatus = mBase1_0->flush(
[&status, flushedWork](
- c2_hidl::Status s, const c2_hidl::WorkBundle& wb) {
+ Status s, const WorkBundle& wb) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
LOG(DEBUG) << "flush -- call failed: " << status << ".";
return;
}
- if (!c2_hidl::utils::objcpy(flushedWork, wb)) {
+ if (!objcpy(flushedWork, wb)) {
status = C2_CORRUPTED;
} else {
status = C2_OK;
@@ -1554,14 +1394,14 @@
}
c2_status_t Codec2Client::Component::drain(C2Component::drain_mode_t mode) {
- Return<c2_hidl::Status> transStatus = mBase1_0->drain(
+ Return<Status> transStatus = mBase1_0->drain(
mode == C2Component::DRAIN_COMPONENT_WITH_EOS);
if (!transStatus.isOk()) {
LOG(ERROR) << "drain -- transaction failed.";
return C2_TRANSACTION_FAILED;
}
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "drain -- call failed: " << status << ".";
}
@@ -1569,13 +1409,13 @@
}
c2_status_t Codec2Client::Component::start() {
- Return<c2_hidl::Status> transStatus = mBase1_0->start();
+ Return<Status> transStatus = mBase1_0->start();
if (!transStatus.isOk()) {
LOG(ERROR) << "start -- transaction failed.";
return C2_TRANSACTION_FAILED;
}
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "start -- call failed: " << status << ".";
}
@@ -1583,13 +1423,13 @@
}
c2_status_t Codec2Client::Component::stop() {
- Return<c2_hidl::Status> transStatus = mBase1_0->stop();
+ Return<Status> transStatus = mBase1_0->stop();
if (!transStatus.isOk()) {
LOG(ERROR) << "stop -- transaction failed.";
return C2_TRANSACTION_FAILED;
}
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "stop -- call failed: " << status << ".";
}
@@ -1597,13 +1437,13 @@
}
c2_status_t Codec2Client::Component::reset() {
- Return<c2_hidl::Status> transStatus = mBase1_0->reset();
+ Return<Status> transStatus = mBase1_0->reset();
if (!transStatus.isOk()) {
LOG(ERROR) << "reset -- transaction failed.";
return C2_TRANSACTION_FAILED;
}
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "reset -- call failed: " << status << ".";
}
@@ -1611,13 +1451,13 @@
}
c2_status_t Codec2Client::Component::release() {
- Return<c2_hidl::Status> transStatus = mBase1_0->release();
+ Return<Status> transStatus = mBase1_0->release();
if (!transStatus.isOk()) {
LOG(ERROR) << "release -- transaction failed.";
return C2_TRANSACTION_FAILED;
}
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "release -- call failed: " << status << ".";
}
@@ -1634,7 +1474,7 @@
c2_status_t status{};
Return<void> transStatus = mBase1_1->configureVideoTunnel(avSyncHwId,
[&status, sidebandHandle](
- c2_hidl::Status s, hardware::hidl_handle const& h) {
+ Status s, hardware::hidl_handle const& h) {
status = static_cast<c2_status_t>(s);
if (h.getNativeHandle()) {
*sidebandHandle = native_handle_clone(h.getNativeHandle());
@@ -1714,7 +1554,7 @@
ALOGD("setOutputSurface -- generation=%u consumer usage=%#llx%s",
generation, (long long)consumerUsage, syncObj ? " sync" : "");
- Return<c2_hidl::Status> transStatus = syncObj ?
+ Return<Status> transStatus = syncObj ?
mBase1_2->setOutputSurfaceWithSyncObj(
static_cast<uint64_t>(blockPoolId),
bqId == 0 ? nullHgbp : igbp, *syncObj) :
@@ -1727,7 +1567,7 @@
return C2_TRANSACTION_FAILED;
}
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "setOutputSurface -- call failed: " << status << ".";
}
@@ -1751,13 +1591,13 @@
C2BlockPool::local_id_t blockPoolId) {
std::scoped_lock lock(mOutputMutex);
mOutputBufferQueue->stop();
- Return<c2_hidl::Status> transStatus = mBase1_0->setOutputSurface(
+ Return<Status> transStatus = mBase1_0->setOutputSurface(
static_cast<uint64_t>(blockPoolId), nullptr);
if (!transStatus.isOk()) {
LOG(ERROR) << "setOutputSurface(stopUsingOutputSurface) -- transaction failed.";
} else {
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "setOutputSurface(stopUsingOutputSurface) -- call failed: "
<< status << ".";
@@ -1772,7 +1612,7 @@
Return<void> transStatus = mBase1_0->connectToInputSurface(
inputSurface->mBase,
[&status, connection](
- c2_hidl::Status s, const sp<c2_hidl::IInputSurfaceConnection>& c) {
+ Status s, const sp<IInputSurfaceConnection>& c) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
LOG(DEBUG) << "connectToInputSurface -- call failed: "
@@ -1796,7 +1636,7 @@
Return<void> transStatus = mBase1_0->connectToOmxInputSurface(
producer, source,
[&status, connection](
- c2_hidl::Status s, const sp<c2_hidl::IInputSurfaceConnection>& c) {
+ Status s, const sp<IInputSurfaceConnection>& c) {
status = static_cast<c2_status_t>(s);
if (status != C2_OK) {
LOG(DEBUG) << "connectToOmxInputSurface -- call failed: "
@@ -1813,13 +1653,13 @@
}
c2_status_t Codec2Client::Component::disconnectFromInputSurface() {
- Return<c2_hidl::Status> transStatus = mBase1_0->disconnectFromInputSurface();
+ Return<Status> transStatus = mBase1_0->disconnectFromInputSurface();
if (!transStatus.isOk()) {
LOG(ERROR) << "disconnectToInputSurface -- transaction failed.";
return C2_TRANSACTION_FAILED;
}
c2_status_t status =
- static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transStatus));
+ static_cast<c2_status_t>(static_cast<Status>(transStatus));
if (status != C2_OK) {
LOG(DEBUG) << "disconnectFromInputSurface -- call failed: "
<< status << ".";
@@ -1866,13 +1706,13 @@
}
// Codec2Client::InputSurface
-Codec2Client::InputSurface::InputSurface(const sp<c2_hidl::IInputSurface>& base)
+Codec2Client::InputSurface::InputSurface(const sp<IInputSurface>& base)
: Configurable{
- [base]() -> sp<c2_hidl::IConfigurable> {
- Return<sp<c2_hidl::IConfigurable>> transResult =
+ [base]() -> sp<IConfigurable> {
+ Return<sp<IConfigurable>> transResult =
base->getConfigurable();
return transResult.isOk() ?
- static_cast<sp<c2_hidl::IConfigurable>>(transResult) :
+ static_cast<sp<IConfigurable>>(transResult) :
nullptr;
}()
},
@@ -1892,19 +1732,19 @@
return mGraphicBufferProducer;
}
-sp<c2_hidl::IInputSurface> Codec2Client::InputSurface::getHalInterface() const {
+sp<IInputSurface> Codec2Client::InputSurface::getHalInterface() const {
return mBase;
}
// Codec2Client::InputSurfaceConnection
Codec2Client::InputSurfaceConnection::InputSurfaceConnection(
- const sp<c2_hidl::IInputSurfaceConnection>& base)
+ const sp<IInputSurfaceConnection>& base)
: Configurable{
- [base]() -> sp<c2_hidl::IConfigurable> {
- Return<sp<c2_hidl::IConfigurable>> transResult =
+ [base]() -> sp<IConfigurable> {
+ Return<sp<IConfigurable>> transResult =
base->getConfigurable();
return transResult.isOk() ?
- static_cast<sp<c2_hidl::IConfigurable>>(transResult) :
+ static_cast<sp<IConfigurable>>(transResult) :
nullptr;
}()
},
@@ -1912,8 +1752,8 @@
}
c2_status_t Codec2Client::InputSurfaceConnection::disconnect() {
- Return<c2_hidl::Status> transResult = mBase->disconnect();
- return static_cast<c2_status_t>(static_cast<c2_hidl::Status>(transResult));
+ Return<Status> transResult = mBase->disconnect();
+ return static_cast<c2_status_t>(static_cast<Status>(transResult));
}
} // namespace android