From 28a35395411faa5595f1a4dcdd2b908a21a88dad Mon Sep 17 00:00:00 2001 From: Chih-Yu Huang Date: Mon, 16 Apr 2018 19:14:26 +0900 Subject: Remove ArcVideoBridge service from framework. We rewrite ArcVideoBridge to HIDL. Then both ArcVideoEncoder and ArcCodec can communicate with it. Bug: 111683541 Test: Pass 1 CTS and check ArcCodec and ArcVideoEncoder work Change-Id: I2febf4120d949ce5d5f4bad3401b9072b34c4456 Merged-In: I2febf4120d949ce5d5f4bad3401b9072b34c4456 (cherry picked from commit 3226871bf2d9d672d9f2e4ab6277faf5393a9dbf) --- .../media/arcvideobridge/IArcVideoBridge.h | 46 ------------ services/media/arcvideobridge/Android.bp | 28 ------- services/media/arcvideobridge/IArcVideoBridge.cpp | 86 ---------------------- 3 files changed, 160 deletions(-) delete mode 100644 headers/media_plugin/media/arcvideobridge/IArcVideoBridge.h delete mode 100644 services/media/arcvideobridge/Android.bp delete mode 100644 services/media/arcvideobridge/IArcVideoBridge.cpp diff --git a/headers/media_plugin/media/arcvideobridge/IArcVideoBridge.h b/headers/media_plugin/media/arcvideobridge/IArcVideoBridge.h deleted file mode 100644 index b32c92eb88..0000000000 --- a/headers/media_plugin/media/arcvideobridge/IArcVideoBridge.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2016 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 ANDROID_IARC_VIDEO_BRIDGE_H -#define ANDROID_IARC_VIDEO_BRIDGE_H - -#include -#include -#include - -namespace android { - -class IArcVideoBridge : public IInterface { -public: - DECLARE_META_INTERFACE(ArcVideoBridge); - - // Returns MojoBootstrapResult for creating mojo ipc channel of - // VideoAcceleratorFactory. - virtual ::arc::MojoBootstrapResult bootstrapVideoAcceleratorFactory() = 0; - - // Get the version of the remote VideoHost on Chromium side. - virtual int32_t hostVersion() = 0; -}; - -class BnArcVideoBridge : public BnInterface { -public: - virtual status_t onTransact( - uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags = 0); -}; - -}; // namespace android - -#endif // ANDROID_IARC_VIDEO_BRIDGE_H diff --git a/services/media/arcvideobridge/Android.bp b/services/media/arcvideobridge/Android.bp deleted file mode 100644 index ca5b896edd..0000000000 --- a/services/media/arcvideobridge/Android.bp +++ /dev/null @@ -1,28 +0,0 @@ -cc_library_shared { - name: "libarcvideobridge", - product_variables: { - arc: { - srcs: [ - "IArcVideoBridge.cpp", - ], - shared_libs: [ - "libarcbridge", - "libarcbridgeservice", - "libbinder", - "libchrome", - "liblog", - "libmojo", - "libutils", - ], - cflags: [ - "-Wall", - "-Werror", - "-Wunused", - "-Wunreachable-code", - ], - include_dirs: [ - "frameworks/native/include/media/arcvideobridge", - ] - } - } -} diff --git a/services/media/arcvideobridge/IArcVideoBridge.cpp b/services/media/arcvideobridge/IArcVideoBridge.cpp deleted file mode 100644 index 468b76b6e1..0000000000 --- a/services/media/arcvideobridge/IArcVideoBridge.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2016 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. - */ - -#define LOG_TAG "IArcVideoBridge" -//#define LOG_NDEBUG 0 - -#include -#include - -#include "IArcVideoBridge.h" -#include -#include - -namespace android { - -enum { - BOOTSTRAP_VIDEO_ACCELERATOR_FACTORY = IBinder::FIRST_CALL_TRANSACTION, - HOST_VERSION, -}; - -class BpArcVideoBridge : public BpInterface { -public: - BpArcVideoBridge(const sp& impl) : BpInterface(impl) { } - - virtual ::arc::MojoBootstrapResult bootstrapVideoAcceleratorFactory() { - Parcel data, reply; - ALOGV("bootstrapVideoAcceleratorFactory"); - data.writeInterfaceToken(IArcVideoBridge::getInterfaceDescriptor()); - status_t status = remote()->transact( - BOOTSTRAP_VIDEO_ACCELERATOR_FACTORY, data, &reply, 0); - if (status != 0) { - ALOGE("transact failed: %d", status); - return arc::MojoBootstrapResult(); - } - return arc::MojoBootstrapResult::createFromParcel(reply); - } - - virtual int32_t hostVersion() { - Parcel data, reply; - ALOGV("hostVersion"); - data.writeInterfaceToken(IArcVideoBridge::getInterfaceDescriptor()); - status_t status = remote()->transact(HOST_VERSION, data, &reply, 0); - if (status != 0) { - ALOGE("transact failed: %d", status); - return false; - } - return reply.readInt32(); - } -}; - -IMPLEMENT_META_INTERFACE(ArcVideoBridge, "android.os.IArcVideoBridge"); - -status_t BnArcVideoBridge::onTransact( - uint32_t code, const Parcel &data, Parcel *reply, uint32_t flags) { - switch(code) { - case BOOTSTRAP_VIDEO_ACCELERATOR_FACTORY: { - ALOGV("BOOTSTRAP_VIDEO_ACCELERATOR_FACTORY"); - CHECK_INTERFACE(IArcVideoBridge, data, reply); - arc::MojoBootstrapResult result = bootstrapVideoAcceleratorFactory(); - return result.writeToParcel(reply); - } - case HOST_VERSION: { - ALOGV("HOST_VERSION"); - CHECK_INTERFACE(IArcVideoBridge, data, reply); - reply->writeInt32(hostVersion()); - return OK; - } - default: - return BBinder::onTransact(code, data, reply, flags); - } -} - -} // namespace android -- cgit v1.2.3-59-g8ed1b