Rename Codec2-related entities
Test: Builds
Bug: 112362730
Change-Id: I5d4c962f9ebacb7c71a5dc9db927484d7435dc57
diff --git a/media/codec2/hidl/client/Android.bp b/media/codec2/hidl/client/Android.bp
index 0819055..bdc02d2 100644
--- a/media/codec2/hidl/client/Android.bp
+++ b/media/codec2/hidl/client/Android.bp
@@ -1,5 +1,5 @@
cc_library {
- name: "libcodec2_hidl_client",
+ name: "libcodec2_client",
srcs: [
"client.cpp",
@@ -8,10 +8,12 @@
shared_libs: [
"android.hardware.graphics.bufferqueue@1.0",
"android.hardware.media.bufferpool@1.0",
- "hardware.google.media.c2@1.0",
+ "android.hardware.media.c2@1.0",
"libbase",
"libbinder",
- "libcodec2_hidl_utils@1.0",
+ "libcodec2",
+ "libcodec2_hidl@1.0",
+ "libcodec2_vndk",
"libcutils",
"libgui",
"libhidlbase",
@@ -19,8 +21,6 @@
"liblog",
"libstagefright_bufferpool@1.0",
"libstagefright_bufferqueue_helper",
- "libstagefright_codec2",
- "libstagefright_codec2_vndk",
"libui",
"libutils",
],
@@ -30,8 +30,8 @@
],
export_shared_lib_headers: [
- "libcodec2_hidl_utils@1.0",
- "libstagefright_codec2",
+ "libcodec2_hidl@1.0",
+ "libcodec2",
],
}
diff --git a/media/codec2/hidl/client/client.cpp b/media/codec2/hidl/client/client.cpp
index ff67681..ddeb4ff 100644
--- a/media/codec2/hidl/client/client.cpp
+++ b/media/codec2/hidl/client/client.cpp
@@ -35,11 +35,11 @@
#undef LOG
#include <android/hardware/media/bufferpool/1.0/IClientManager.h>
-#include <hardware/google/media/c2/1.0/IComponent.h>
-#include <hardware/google/media/c2/1.0/IComponentInterface.h>
-#include <hardware/google/media/c2/1.0/IComponentListener.h>
-#include <hardware/google/media/c2/1.0/IComponentStore.h>
-#include <hardware/google/media/c2/1.0/IConfigurable.h>
+#include <android/hardware/media/c2/1.0/IComponent.h>
+#include <android/hardware/media/c2/1.0/IComponentInterface.h>
+#include <android/hardware/media/c2/1.0/IComponentListener.h>
+#include <android/hardware/media/c2/1.0/IComponentStore.h>
+#include <android/hardware/media/c2/1.0/IConfigurable.h>
#include <C2Debug.h>
#include <C2BufferPriv.h>
@@ -53,8 +53,8 @@
using ::android::hardware::Void;
using ::android::TWGraphicBufferProducer;
-using namespace ::hardware::google::media::c2::V1_0;
-using namespace ::hardware::google::media::c2::V1_0::utils;
+using namespace ::android::hardware::media::c2::V1_0;
+using namespace ::android::hardware::media::c2::V1_0::utils;
using namespace ::android::hardware::media::bufferpool::V1_0;
using namespace ::android::hardware::media::bufferpool::V1_0::implementation;
diff --git a/media/codec2/hidl/client/include/codec2/hidl/client.h b/media/codec2/hidl/client/include/codec2/hidl/client.h
index fb59ad6..3ab3967 100644
--- a/media/codec2/hidl/client/include/codec2/hidl/client.h
+++ b/media/codec2/hidl/client/include/codec2/hidl/client.h
@@ -64,8 +64,8 @@
*/
// Forward declaration of Codec2.0 HIDL interfaces
+namespace android {
namespace hardware {
-namespace google {
namespace media {
namespace c2 {
namespace V1_0 {
@@ -78,8 +78,8 @@
} // namespace V1_0
} // namespace c2
} // namespace media
-} // namespace google
} // namespace hardware
+} // namespace android
namespace android {
namespace hardware {
@@ -119,7 +119,7 @@
// declaration of an inner class is not possible.
struct Codec2ConfigurableClient {
- typedef ::hardware::google::media::c2::V1_0::IConfigurable Base;
+ typedef ::android::hardware::media::c2::V1_0::IConfigurable Base;
const C2String& getName() const;
@@ -156,7 +156,7 @@
struct Codec2Client : public Codec2ConfigurableClient {
- typedef ::hardware::google::media::c2::V1_0::IComponentStore Base;
+ typedef ::android::hardware::media::c2::V1_0::IComponentStore Base;
struct Listener;
@@ -306,7 +306,7 @@
struct Codec2Client::Component : public Codec2Client::Configurable {
- typedef ::hardware::google::media::c2::V1_0::IComponent Base;
+ typedef ::android::hardware::media::c2::V1_0::IComponent Base;
c2_status_t createBlockPool(
C2Allocator::id_t id,
@@ -405,7 +405,7 @@
// mInputBufferCount.
mutable std::map<uint64_t, size_t> mInputBufferCount;
- ::hardware::google::media::c2::V1_0::utils::DefaultBufferPoolSender
+ ::android::hardware::media::c2::V1_0::utils::DefaultBufferPoolSender
mBufferPoolSender;
std::mutex mOutputBufferQueueMutex;
@@ -430,9 +430,9 @@
struct Codec2Client::InputSurface {
public:
- typedef ::hardware::google::media::c2::V1_0::IInputSurface Base;
+ typedef ::android::hardware::media::c2::V1_0::IInputSurface Base;
- typedef ::hardware::google::media::c2::V1_0::IInputSurfaceConnection
+ typedef ::android::hardware::media::c2::V1_0::IInputSurfaceConnection
ConnectionBase;
typedef Codec2Client::InputSurfaceConnection Connection;
@@ -465,7 +465,7 @@
struct Codec2Client::InputSurfaceConnection {
- typedef ::hardware::google::media::c2::V1_0::IInputSurfaceConnection Base;
+ typedef ::android::hardware::media::c2::V1_0::IInputSurfaceConnection Base;
c2_status_t disconnect();