Rename Codec2-related entities
Test: Builds
Bug: 112362730
Change-Id: I5d4c962f9ebacb7c71a5dc9db927484d7435dc57
diff --git a/media/codec2/hidl/services/Android.bp b/media/codec2/hidl/services/Android.bp
index 7a835ab..965971e 100644
--- a/media/codec2/hidl/services/Android.bp
+++ b/media/codec2/hidl/services/Android.bp
@@ -1,5 +1,5 @@
cc_binary {
- name: "hardware.google.media.c2@1.0-service",
+ name: "android.hardware.media.c2@1.0-service",
defaults: ["hidl_defaults"],
soc_specific: true,
relative_install_path: "hw",
@@ -7,19 +7,19 @@
"vendor.cpp",
],
- init_rc: ["hardware.google.media.c2@1.0-service.rc"],
+ init_rc: ["android.hardware.media.c2@1.0-service.rc"],
shared_libs: [
+ "android.hardware.media.c2@1.0",
"android.hardware.media.omx@1.0",
- "hardware.google.media.c2@1.0",
"libavservices_minijail_vendor",
"libbinder",
- "libcodec2_hidl_utils@1.0",
+ "libcodec2_hidl@1.0",
+ "libcodec2_vndk",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
- "libstagefright_codec2_vndk",
"libstagefright_omx",
"libstagefright_xmlparser",
"libutils",
@@ -38,7 +38,7 @@
}
cc_library_shared {
- name: "libmedia_codecserviceregistrant",
+ name: "libcodec2_serviceregistrant",
// need vendor version for update packaging, system version may have more dependencies
vendor_available: true,
srcs: [
@@ -50,43 +50,43 @@
],
shared_libs: [
- "hardware.google.media.c2@1.0",
+ "android.hardware.media.c2@1.0",
+ "libcodec2_hidl@1.0",
+ "libcodec2_vndk",
"liblog",
- "libcodec2_hidl_utils@1.0",
- "libstagefright_codec2_vndk",
"libutils",
],
// Codecs
runtime_libs: [
- "libstagefright_soft_c2avcdec",
- "libstagefright_soft_c2avcenc",
- "libstagefright_soft_c2aacdec",
- "libstagefright_soft_c2aacenc",
- "libstagefright_soft_c2amrnbdec",
- "libstagefright_soft_c2amrnbenc",
- "libstagefright_soft_c2amrwbdec",
- "libstagefright_soft_c2amrwbenc",
- "libstagefright_soft_c2hevcdec",
- "libstagefright_soft_c2g711alawdec",
- "libstagefright_soft_c2g711mlawdec",
- "libstagefright_soft_c2mpeg2dec",
- "libstagefright_soft_c2h263dec",
- "libstagefright_soft_c2h263enc",
- "libstagefright_soft_c2mpeg4dec",
- "libstagefright_soft_c2mpeg4enc",
- "libstagefright_soft_c2mp3dec",
- "libstagefright_soft_c2vorbisdec",
- "libstagefright_soft_c2opusdec",
- "libstagefright_soft_c2vp8dec",
- "libstagefright_soft_c2vp9dec",
- "libstagefright_soft_c2vp8enc",
- "libstagefright_soft_c2vp9enc",
- "libstagefright_soft_c2rawdec",
- "libstagefright_soft_c2flacdec",
- "libstagefright_soft_c2flacenc",
- "libstagefright_soft_c2gsmdec",
- "libstagefright_soft_c2xaacdec",
+ "libcodec2_soft_avcdec",
+ "libcodec2_soft_avcenc",
+ "libcodec2_soft_aacdec",
+ "libcodec2_soft_aacenc",
+ "libcodec2_soft_amrnbdec",
+ "libcodec2_soft_amrnbenc",
+ "libcodec2_soft_amrwbdec",
+ "libcodec2_soft_amrwbenc",
+ "libcodec2_soft_hevcdec",
+ "libcodec2_soft_g711alawdec",
+ "libcodec2_soft_g711mlawdec",
+ "libcodec2_soft_mpeg2dec",
+ "libcodec2_soft_h263dec",
+ "libcodec2_soft_h263enc",
+ "libcodec2_soft_mpeg4dec",
+ "libcodec2_soft_mpeg4enc",
+ "libcodec2_soft_mp3dec",
+ "libcodec2_soft_vorbisdec",
+ "libcodec2_soft_opusdec",
+ "libcodec2_soft_vp8dec",
+ "libcodec2_soft_vp9dec",
+ "libcodec2_soft_vp8enc",
+ "libcodec2_soft_vp9enc",
+ "libcodec2_soft_rawdec",
+ "libcodec2_soft_flacdec",
+ "libcodec2_soft_flacenc",
+ "libcodec2_soft_gsmdec",
+ "libcodec2_soft_xaacdec",
],
compile_multilib: "32",
diff --git a/media/codec2/hidl/services/C2SoftwareCodecServiceRegistrant.cpp b/media/codec2/hidl/services/C2SoftwareCodecServiceRegistrant.cpp
index 04efa44..e10ae6e 100644
--- a/media/codec2/hidl/services/C2SoftwareCodecServiceRegistrant.cpp
+++ b/media/codec2/hidl/services/C2SoftwareCodecServiceRegistrant.cpp
@@ -23,7 +23,7 @@
#include <log/log.h>
extern "C" void RegisterCodecServices() {
- using namespace ::hardware::google::media::c2::V1_0;
+ using namespace ::android::hardware::media::c2::V1_0;
android::sp<IComponentStore> store =
new utils::ComponentStore(
android::GetCodec2PlatformComponentStore());
diff --git a/media/codec2/hidl/services/android.hardware.media.c2@1.0-service.rc b/media/codec2/hidl/services/android.hardware.media.c2@1.0-service.rc
new file mode 100644
index 0000000..8806bd1f
--- /dev/null
+++ b/media/codec2/hidl/services/android.hardware.media.c2@1.0-service.rc
@@ -0,0 +1,7 @@
+service android-hardware-media-c2-hal-1-0 /vendor/bin/hw/android.hardware.media.c2@1.0-service
+ class hal
+ user mediacodec
+ group camera mediadrm drmrpc
+ ioprio rt 4
+ writepid /dev/cpuset/foreground/tasks
+
diff --git a/media/codec2/hidl/services/hardware.google.media.c2@1.0-service.rc b/media/codec2/hidl/services/hardware.google.media.c2@1.0-service.rc
deleted file mode 100644
index 0640e6a..0000000
--- a/media/codec2/hidl/services/hardware.google.media.c2@1.0-service.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-service hardware-google-media-c2-hal-1-0 /vendor/bin/hw/hardware.google.media.c2@1.0-service
- class hal
- user mediacodec
- group camera mediadrm drmrpc
- ioprio rt 4
- writepid /dev/cpuset/foreground/tasks
-
diff --git a/media/codec2/hidl/services/vendor.cpp b/media/codec2/hidl/services/vendor.cpp
index 149d4f9..ef2f98e 100644
--- a/media/codec2/hidl/services/vendor.cpp
+++ b/media/codec2/hidl/services/vendor.cpp
@@ -15,7 +15,7 @@
*/
//#define LOG_NDEBUG 0
-#define LOG_TAG "hardware.google.media.c2@1.0-service"
+#define LOG_TAG "android.hardware.media.c2@1.0-service"
#include <codec2/hidl/1.0/ComponentStore.h>
#include <hidl/HidlTransportSupport.h>
@@ -97,7 +97,7 @@
};
int main(int /* argc */, char** /* argv */) {
- ALOGD("hardware.google.media.c2@1.0-service starting...");
+ ALOGD("android.hardware.media.c2@1.0-service starting...");
signal(SIGPIPE, SIG_IGN);
android::SetUpMinijail(kBaseSeccompPolicyPath, kExtSeccompPolicyPath);
@@ -112,7 +112,7 @@
// Create IComponentStore service.
{
- using namespace ::hardware::google::media::c2::V1_0;
+ using namespace ::android::hardware::media::c2::V1_0;
android::sp<IComponentStore> store;
// Vendor's TODO: Replace this with