From a1ea45dbd6b33f54f4a267397d30ad8c94536750 Mon Sep 17 00:00:00 2001
From: Wonsik Kim <wonsik@google.com>
Date: Thu, 22 Mar 2018 10:14:50 -0700
Subject: [PATCH] Move V4L2 store into hardware/google/av
In addition, build only if hardware/google/av is visible.
Bug: 74403547
Test: builds
Change-Id: I8da9be96013822a006a5de135e508259019d672e
---
Android.bp | 20 --
Android.mk | 6 +
C2VDAComponentStore.cpp | 406 ----------------------------------------
include/C2V4l2Support.h | 21 ---
4 files changed, 6 insertions(+), 447 deletions(-)
delete mode 100644 Android.bp
delete mode 100644 C2VDAComponentStore.cpp
delete mode 100644 include/C2V4l2Support.h
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index d92c553..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-cc_library_shared {
- name: "libv4l2_c2componentstore",
- srcs: [
- "C2VDAComponentStore.cpp",
- ],
- shared_libs: [
- "libstagefright_codec2",
- "libstagefright_codec2_vndk",
- "liblog",
- "libutils",
- ],
- cflags: [
- "-Werror",
- "-Wall",
- "-std=c++14",
- ],
- export_include_dirs: [
- "include",
- ],
-}
diff --git a/Android.mk b/Android.mk
index 4695d72..d007d76 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,7 @@
+# Build only if hardware/google/av is visible; otherwise, don't build any
+# target under this repository.
+ifneq (,$(findstring hardware/google/av,$(PRODUCT_SOONG_NAMESPACES)))
+
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -64,3 +68,5 @@ endif
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
+
+endif
diff --git a/C2VDAComponentStore.cpp b/C2VDAComponentStore.cpp
deleted file mode 100644
index acc6ea1..0000000
--- a/C2VDAComponentStore.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//#define LOG_NDEBUG 0
-#define LOG_TAG "C2VDAComponentStore"
-#include <C2Component.h>
-#include <C2ComponentFactory.h>
-#include <C2V4l2Support.h>
-
-#include <utils/Log.h>
-
-#include <dlfcn.h>
-
-#include <map>
-#include <memory>
-#include <mutex>
-
-#define UNUSED(expr) \
- do { \
- (void)(expr); \
- } while (0)
-
-namespace android {
-class C2VDAComponentStore : public C2ComponentStore {
-public:
- C2VDAComponentStore();
- ~C2VDAComponentStore() override = default;
-
- // The implementation of C2ComponentStore.
- C2String getName() const override;
- c2_status_t createComponent(C2String name,
- std::shared_ptr<C2Component>* const component) override;
- c2_status_t createInterface(C2String name,
- std::shared_ptr<C2ComponentInterface>* const interface) override;
- std::vector<std::shared_ptr<const C2Component::Traits>> listComponents() override;
- c2_status_t copyBuffer(std::shared_ptr<C2GraphicBuffer> src,
- std::shared_ptr<C2GraphicBuffer> dst) override;
- c2_status_t query_sm(const std::vector<C2Param*>& stackParams,
- const std::vector<C2Param::Index>& heapParamIndices,
- std::vector<std::unique_ptr<C2Param>>* const heapParams) const override;
- c2_status_t config_sm(const std::vector<C2Param*>& params,
- std::vector<std::unique_ptr<C2SettingResult>>* const failures) override;
- std::shared_ptr<C2ParamReflector> getParamReflector() const override;
- c2_status_t querySupportedParams_nb(
- std::vector<std::shared_ptr<C2ParamDescriptor>>* const params) const override;
- c2_status_t querySupportedValues_sm(
- std::vector<C2FieldSupportedValuesQuery>& fields) const override;
-
-private:
- enum class C2VDACodec {
- UNKNOWN,
- H264,
- VP8,
- VP9,
- };
-
- /**
- * An object encapsulating a loaded component module.
- *
- * \todo provide a way to add traits to known components here to avoid loading the .so-s
- * for listComponents
- */
- class ComponentModule : public C2ComponentFactory {
- public:
- ComponentModule()
- : mInit(C2_NO_INIT),
- mLibHandle(nullptr),
- createFactory(nullptr),
- destroyFactory(nullptr),
- mComponentFactory(nullptr) {
- }
-
- ~ComponentModule() override;
- c2_status_t init(std::string libPath, C2VDACodec codec);
-
- // Return the traits of the component in this module.
- std::shared_ptr<const C2Component::Traits> getTraits();
-
- // The implementation of C2ComponentFactory.
- c2_status_t createComponent(
- c2_node_id_t id, std::shared_ptr<C2Component>* component,
- ComponentDeleter deleter = std::default_delete<C2Component>()) override;
- c2_status_t createInterface(
- c2_node_id_t id, std::shared_ptr<C2ComponentInterface>* interface,
- InterfaceDeleter deleter = std::default_delete<C2ComponentInterface>()) override;
-
- protected:
- std::recursive_mutex mLock; ///< lock protecting mTraits
- std::shared_ptr<C2Component::Traits> mTraits; ///< cached component traits
-
- c2_status_t mInit; ///< initialization result
-
- void* mLibHandle; ///< loaded library handle
- C2ComponentFactory::CreateCodec2FactoryFunc createFactory; ///< loaded create function
- C2ComponentFactory::DestroyCodec2FactoryFunc destroyFactory; ///< loaded destroy function
- C2ComponentFactory* mComponentFactory; ///< loaded/created component factory
- };
-
- /**
- * An object encapsulating a loadable component module.
- *
- * \todo make this also work for enumerations
- */
- class ComponentLoader {
- public:
- ComponentLoader(std::string libPath, C2VDACodec codec) : mLibPath(libPath), mCodec(codec) {}
-
- /**
- * Load the component module.
- *
- * This method simply returns the component module if it is already currently loaded, or
- * attempts to load it if it is not.
- *
- * \param module[out] pointer to the shared pointer where the loaded module shall be stored.
- * This will be nullptr on error.
- *
- * \retval C2_OK the component module has been successfully loaded
- * \retval C2_NO_MEMORY not enough memory to loading the component module
- * \retval C2_NOT_FOUND could not locate the component module
- * \retval C2_CORRUPTED the component module could not be loaded
- * \retval C2_REFUSED permission denied to load the component module
- */
- c2_status_t fetchModule(std::shared_ptr<ComponentModule>* module);
-
- private:
- std::mutex mMutex; ///< mutex guarding the module
- std::weak_ptr<ComponentModule> mModule; ///< weak reference to the loaded module
- std::string mLibPath; ///< library path (or name)
- C2VDACodec mCodec = C2VDACodec::UNKNOWN;
- };
-
- c2_status_t findComponent(C2String name, ComponentLoader** loader);
-
- std::map<C2String, ComponentLoader> mComponents; ///< list of components
-};
-
-C2VDAComponentStore::ComponentModule::~ComponentModule() {
- ALOGV("in %s", __func__);
- if (destroyFactory && mComponentFactory) {
- destroyFactory(mComponentFactory);
- }
- if (mLibHandle) {
- ALOGV("unloading dll");
- dlclose(mLibHandle);
- }
-}
-
-c2_status_t C2VDAComponentStore::ComponentModule::init(std::string libPath, C2VDACodec codec) {
- ALOGV("in %s", __func__);
- ALOGV("loading dll");
- mLibHandle = dlopen(libPath.c_str(), RTLD_NOW | RTLD_NODELETE);
- if (mLibHandle == nullptr) {
- ALOGD("could not dlopen %s: %s", libPath.c_str(), dlerror());
- mInit = C2_CORRUPTED;
- } else {
- std::string createFactoryName;
- std::string destroyFactoryName;
- switch (codec) {
- case C2VDACodec::H264:
- createFactoryName = "CreateC2VDAH264Factory";
- destroyFactoryName = "DestroyC2VDAH264Factory";
- break;
- case C2VDACodec::VP8:
- createFactoryName = "CreateC2VDAVP8Factory";
- destroyFactoryName = "DestroyC2VDAVP8Factory";
- break;
- case C2VDACodec::VP9:
- createFactoryName = "CreateC2VDAVP9Factory";
- destroyFactoryName = "DestroyC2VDAVP9Factory";
- break;
- default:
- ALOGE("Unknown ");
- return C2_CORRUPTED;
- }
- createFactory = (C2ComponentFactory::CreateCodec2FactoryFunc)dlsym(
- mLibHandle, createFactoryName.c_str());
- destroyFactory = (C2ComponentFactory::DestroyCodec2FactoryFunc)dlsym(
- mLibHandle, destroyFactoryName.c_str());
-
- mComponentFactory = createFactory();
- if (mComponentFactory == nullptr) {
- ALOGD("could not create factory in %s", libPath.c_str());
- mInit = C2_NO_MEMORY;
- } else {
- mInit = C2_OK;
- }
- }
- return mInit;
-}
-
-std::shared_ptr<const C2Component::Traits> C2VDAComponentStore::ComponentModule::getTraits() {
- std::unique_lock<std::recursive_mutex> lock(mLock);
- if (!mTraits) {
- std::shared_ptr<C2ComponentInterface> intf;
- auto res = createInterface(0, &intf);
- if (res != C2_OK) {
- ALOGE("failed to create interface: %d", res);
- return nullptr;
- }
-
- std::shared_ptr<C2Component::Traits> traits(new (std::nothrow) C2Component::Traits);
- if (traits) {
- traits->name = intf->getName();
- // TODO: get this from interface properly.
- bool encoder = (traits->name.find("encoder") != std::string::npos);
- uint32_t mediaTypeIndex = encoder ? C2PortMimeConfig::output::PARAM_TYPE
- : C2PortMimeConfig::input::PARAM_TYPE;
- std::vector<std::unique_ptr<C2Param>> params;
- res = intf->query_vb({}, { mediaTypeIndex }, C2_MAY_BLOCK, ¶ms);
- if (res != C2_OK) {
- ALOGE("failed to query interface: %d", res);
- return nullptr;
- }
- if (params.size() != 1u) {
- ALOGE("failed to query interface: unexpected vector size: %zu", params.size());
- return nullptr;
- }
- C2PortMimeConfig *mediaTypeConfig = (C2PortMimeConfig *)(params[0].get());
- if (mediaTypeConfig == nullptr) {
- ALOGE("failed to query media type");
- return nullptr;
- }
- traits->mediaType = mediaTypeConfig->m.value;
- // TODO: get this properly.
- // Set the rank prior to c2.google.* (=0x200) and after OMX.google.* (=0x100) by now.
- // In the future this should be prior to OMX.google.* as well so that ARC HW codec
- // would be the first priority.
- traits->rank = 0x180;
- }
- mTraits = traits;
- }
- return mTraits;
-}
-
-c2_status_t C2VDAComponentStore::ComponentModule::createComponent(
- c2_node_id_t id, std::shared_ptr<C2Component>* component,
- std::function<void(::C2Component*)> deleter) {
- UNUSED(deleter);
- component->reset();
- if (mInit != C2_OK) {
- return mInit;
- }
- return mComponentFactory->createComponent(id, component,
- C2ComponentFactory::ComponentDeleter());
-}
-
-c2_status_t C2VDAComponentStore::ComponentModule::createInterface(
- c2_node_id_t id, std::shared_ptr<C2ComponentInterface>* interface,
- std::function<void(::C2ComponentInterface*)> deleter) {
- UNUSED(deleter);
- interface->reset();
- if (mInit != C2_OK) {
- return mInit;
- }
- return mComponentFactory->createInterface(id, interface,
- C2ComponentFactory::InterfaceDeleter());
-}
-
-c2_status_t C2VDAComponentStore::ComponentLoader::fetchModule(
- std::shared_ptr<ComponentModule>* module) {
- c2_status_t res = C2_OK;
- std::lock_guard<std::mutex> lock(mMutex);
- std::shared_ptr<ComponentModule> localModule = mModule.lock();
- if (localModule == nullptr) {
- localModule = std::make_shared<ComponentModule>();
- res = localModule->init(mLibPath, mCodec);
- if (res == C2_OK) {
- mModule = localModule;
- }
- }
- *module = localModule;
- return res;
-}
-
-C2VDAComponentStore::C2VDAComponentStore() {
- // TODO: move this also into a .so so it can be updated
- mComponents.emplace(std::piecewise_construct, std::forward_as_tuple("c2.v4l2.h264.decoder"),
- std::forward_as_tuple("libv4l2_codec2.so", C2VDACodec::H264));
- mComponents.emplace(std::piecewise_construct, std::forward_as_tuple("c2.v4l2.vp8.decoder"),
- std::forward_as_tuple("libv4l2_codec2.so", C2VDACodec::VP8));
- mComponents.emplace(std::piecewise_construct, std::forward_as_tuple("c2.v4l2.vp9.decoder"),
- std::forward_as_tuple("libv4l2_codec2.so", C2VDACodec::VP9));
-}
-
-C2String C2VDAComponentStore::getName() const {
- return "android.componentStore.vda";
-}
-
-std::vector<std::shared_ptr<const C2Component::Traits>> C2VDAComponentStore::listComponents() {
- // This method SHALL return within 500ms.
- std::vector<std::shared_ptr<const C2Component::Traits>> list;
- for (auto& it : mComponents) {
- ComponentLoader& loader = it.second;
- std::shared_ptr<ComponentModule> module;
- c2_status_t res = loader.fetchModule(&module);
- if (res == C2_OK) {
- std::shared_ptr<const C2Component::Traits> traits = module->getTraits();
- if (traits) {
- list.push_back(traits);
- }
- }
- }
- return list;
-}
-
-c2_status_t C2VDAComponentStore::findComponent(C2String name, ComponentLoader** loader) {
- *loader = nullptr;
- auto pos = mComponents.find(name);
- // TODO: check aliases
- if (pos == mComponents.end()) {
- return C2_NOT_FOUND;
- }
- *loader = &pos->second;
- return C2_OK;
-}
-
-c2_status_t C2VDAComponentStore::createComponent(C2String name,
- std::shared_ptr<C2Component>* const component) {
- // This method SHALL return within 100ms.
- component->reset();
- ComponentLoader* loader;
- c2_status_t res = findComponent(name, &loader);
- if (res == C2_OK) {
- std::shared_ptr<ComponentModule> module;
- res = loader->fetchModule(&module);
- if (res == C2_OK) {
- // TODO: get a unique node ID
- res = module->createComponent(0, component);
- }
- }
- return res;
-}
-
-c2_status_t C2VDAComponentStore::createInterface(
- C2String name, std::shared_ptr<C2ComponentInterface>* const interface) {
- // This method SHALL return within 100ms.
- interface->reset();
- ComponentLoader* loader;
- c2_status_t res = findComponent(name, &loader);
- if (res == C2_OK) {
- std::shared_ptr<ComponentModule> module;
- res = loader->fetchModule(&module);
- if (res == C2_OK) {
- // TODO: get a unique node ID
- res = module->createInterface(0, interface);
- }
- }
- return res;
-}
-
-c2_status_t C2VDAComponentStore::copyBuffer(std::shared_ptr<C2GraphicBuffer> src,
- std::shared_ptr<C2GraphicBuffer> dst) {
- UNUSED(src);
- UNUSED(dst);
- return C2_OMITTED;
-}
-
-c2_status_t C2VDAComponentStore::query_sm(
- const std::vector<C2Param*>& stackParams,
- const std::vector<C2Param::Index>& heapParamIndices,
- std::vector<std::unique_ptr<C2Param>>* const heapParams) const {
- // there are no supported configs
- UNUSED(heapParams);
- return stackParams.empty() && heapParamIndices.empty() ? C2_OK : C2_BAD_INDEX;
-}
-
-c2_status_t C2VDAComponentStore::config_sm(
- const std::vector<C2Param*>& params,
- std::vector<std::unique_ptr<C2SettingResult>>* const failures) {
- // there are no supported configs
- UNUSED(failures);
- return params.empty() ? C2_OK : C2_BAD_INDEX;
-}
-
-std::shared_ptr<C2ParamReflector> C2VDAComponentStore::getParamReflector() const {
- // TODO
- return nullptr;
-}
-
-c2_status_t C2VDAComponentStore::querySupportedParams_nb(
- std::vector<std::shared_ptr<C2ParamDescriptor>>* const params) const {
- // there are no supported config params
- UNUSED(params);
- return C2_OK;
-}
-
-c2_status_t C2VDAComponentStore::querySupportedValues_sm(
- std::vector<C2FieldSupportedValuesQuery>& fields) const {
- // there are no supported config params
- return fields.empty() ? C2_OK : C2_BAD_INDEX;
-}
-
-std::shared_ptr<C2ComponentStore> GetCodec2VDAComponentStore() {
- static std::mutex mutex;
- static std::weak_ptr<C2ComponentStore> platformStore;
- std::lock_guard<std::mutex> lock(mutex);
- std::shared_ptr<C2ComponentStore> store = platformStore.lock();
- if (store == nullptr) {
- store = std::make_shared<C2VDAComponentStore>();
- platformStore = store;
- }
- return store;
-}
-
-} // namespace android
diff --git a/include/C2V4l2Support.h b/include/C2V4l2Support.h
deleted file mode 100644
index 2f1d056..0000000
--- a/include/C2V4l2Support.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ANDROID_CODEC2_V4L2_SUPPORT_H
-#define ANDROID_CODEC2_V4L2_SUPPORT_H
-
-#include <C2Component.h>
-
-#include <memory>
-
-namespace android {
-
-/**
- * Returns the C2VDA component store.
- * \retval nullptr if the platform component store could not be obtained
- */
-std::shared_ptr<C2ComponentStore> GetCodec2VDAComponentStore();
-} // namespace android
-
-#endif // ANDROID_CODEC2_V4L2_SUPPORT_H
--
GitLab