Rename Codec2-related entities
Test: Builds
Bug: 112362730
Change-Id: I5d4c962f9ebacb7c71a5dc9db927484d7435dc57
diff --git a/media/codec2/components/Android.bp b/media/codec2/components/Android.bp
deleted file mode 100644
index e8176cf..0000000
--- a/media/codec2/components/Android.bp
+++ /dev/null
@@ -1,3 +0,0 @@
-subdirs = [
- "*",
-]
diff --git a/media/codec2/components/aac/Android.bp b/media/codec2/components/aac/Android.bp
index b70f30a..9eca585 100644
--- a/media/codec2/components/aac/Android.bp
+++ b/media/codec2/components/aac/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2aacdec",
+ name: "libcodec2_soft_aacdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: [
@@ -16,10 +16,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2aacenc",
+ name: "libcodec2_soft_aacenc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftAacEnc.cpp"],
diff --git a/media/codec2/components/amr_nb_wb/Android.bp b/media/codec2/components/amr_nb_wb/Android.bp
index 764b3db..ce25bc9 100644
--- a/media/codec2/components/amr_nb_wb/Android.bp
+++ b/media/codec2/components/amr_nb_wb/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2amrnbdec",
+ name: "libcodec2_soft_amrnbdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftAmrDec.cpp"],
@@ -22,10 +22,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2amrwbdec",
+ name: "libcodec2_soft_amrwbdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftAmrDec.cpp"],
@@ -41,10 +41,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2amrnbenc",
+ name: "libcodec2_soft_amrnbenc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftAmrNbEnc.cpp"],
@@ -59,10 +59,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2amrwbenc",
+ name: "libcodec2_soft_amrwbenc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftAmrWbEnc.cpp"],
diff --git a/media/codec2/components/avc/Android.bp b/media/codec2/components/avc/Android.bp
index d883951..4021444 100644
--- a/media/codec2/components/avc/Android.bp
+++ b/media/codec2/components/avc/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2avcdec",
+ name: "libcodec2_soft_avcdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_signed-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_signed-defaults",
],
static_libs: ["libavcdec"],
@@ -16,10 +16,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2avcenc",
+ name: "libcodec2_soft_avcenc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_signed-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_signed-defaults",
],
static_libs: ["libavcenc"],
diff --git a/media/codec2/components/base/Android.bp b/media/codec2/components/base/Android.bp
index ad456e2..06bb81a 100644
--- a/media/codec2/components/base/Android.bp
+++ b/media/codec2/components/base/Android.bp
@@ -1,8 +1,8 @@
// DO NOT DEPEND ON THIS DIRECTLY
-// use libstagefright_soft_c2-defaults instead
+// use libcodec2_soft-defaults instead
cc_library_shared {
- name: "libstagefright_soft_c2common",
- defaults: ["libstagefright_codec2-impl-defaults"],
+ name: "libcodec2_soft_common",
+ defaults: ["libcodec2-impl-defaults"],
vendor_available: true,
srcs: [
@@ -15,13 +15,13 @@
],
export_shared_lib_headers: [
- "libstagefright_ccodec_utils",
+ "libsfplugin_ccodec_utils",
],
shared_libs: [
"libcutils", // for properties
"liblog", // for ALOG
- "libstagefright_ccodec_utils", // for ImageCopy
+ "libsfplugin_ccodec_utils", // for ImageCopy
"libstagefright_foundation", // for Mutexed
],
@@ -42,20 +42,20 @@
// public dependency for software codec implementation
// to be used by code under media/codecs/* only as its stability is not guaranteed
cc_defaults {
- name: "libstagefright_soft_c2-defaults",
- defaults: ["libstagefright_codec2-impl-defaults"],
+ name: "libcodec2_soft-defaults",
+ defaults: ["libcodec2-impl-defaults"],
vendor_available: true,
export_shared_lib_headers: [
- "libstagefright_ccodec_utils",
+ "libsfplugin_ccodec_utils",
],
shared_libs: [
+ "libcodec2_soft_common",
"libcutils", // for properties
"liblog", // for ALOG
+ "libsfplugin_ccodec_utils", // for ImageCopy
"libstagefright_foundation", // for ColorUtils and MIME
- "libstagefright_ccodec_utils", // for ImageCopy
- "libstagefright_soft_c2common",
],
cflags: [
@@ -69,7 +69,7 @@
// public dependency for software codec implementation
// to be used by code under media/codecs/* only
cc_defaults {
- name: "libstagefright_soft_c2_sanitize_all-defaults",
+ name: "libcodec2_soft_sanitize_all-defaults",
sanitize: {
misc_undefined: [
@@ -86,7 +86,7 @@
// public dependency for software codec implementation
// to be used by code under media/codecs/* only
cc_defaults {
- name: "libstagefright_soft_c2_sanitize_signed-defaults",
+ name: "libcodec2_soft_sanitize_signed-defaults",
sanitize: {
misc_undefined: [
@@ -101,7 +101,7 @@
// TEMP: used by cheets2 project - remove when no longer used
cc_library_shared {
- name: "libstagefright_simple_c2component",
+ name: "libcodec2_simple_component",
vendor_available: true,
srcs: [
@@ -117,10 +117,10 @@
],
shared_libs: [
+ "libcodec2",
+ "libcodec2_vndk",
"libcutils",
"liblog",
- "libstagefright_codec2",
- "libstagefright_codec2_vndk",
"libstagefright_foundation",
"libutils",
],
diff --git a/media/codec2/components/cmds/Android.bp b/media/codec2/components/cmds/Android.bp
index 8fb9bf9..994dfee 100644
--- a/media/codec2/components/cmds/Android.bp
+++ b/media/codec2/components/cmds/Android.bp
@@ -1,6 +1,6 @@
cc_binary {
- name: "codec2",
- defaults: ["libstagefright_codec2-impl-defaults"],
+ name: "codec2play",
+ defaults: ["libcodec2-impl-defaults"],
srcs: [
"codec2.cpp",
diff --git a/media/codec2/components/flac/Android.bp b/media/codec2/components/flac/Android.bp
index 32c3b36..d485964 100644
--- a/media/codec2/components/flac/Android.bp
+++ b/media/codec2/components/flac/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2flacdec",
+ name: "libcodec2_soft_flacdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
header_libs: ["libFLAC-headers"],
@@ -15,10 +15,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2flacenc",
+ name: "libcodec2_soft_flacenc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftFlacEnc.cpp"],
diff --git a/media/codec2/components/g711/Android.bp b/media/codec2/components/g711/Android.bp
index 56cbc20..3ede68c 100644
--- a/media/codec2/components/g711/Android.bp
+++ b/media/codec2/components/g711/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2g711alawdec",
+ name: "libcodec2_soft_g711alawdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftG711Dec.cpp"],
@@ -13,10 +13,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2g711mlawdec",
+ name: "libcodec2_soft_g711mlawdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftG711Dec.cpp"],
diff --git a/media/codec2/components/gsm/Android.bp b/media/codec2/components/gsm/Android.bp
index 8075747..9330c01 100644
--- a/media/codec2/components/gsm/Android.bp
+++ b/media/codec2/components/gsm/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2gsmdec",
+ name: "libcodec2_soft_gsmdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftGsmDec.cpp"],
diff --git a/media/codec2/components/hevc/Android.bp b/media/codec2/components/hevc/Android.bp
index 519de68..2a045e1 100644
--- a/media/codec2/components/hevc/Android.bp
+++ b/media/codec2/components/hevc/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2hevcdec",
+ name: "libcodec2_soft_hevcdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_signed-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_signed-defaults",
],
srcs: ["C2SoftHevcDec.cpp"],
diff --git a/media/codec2/components/mp3/Android.bp b/media/codec2/components/mp3/Android.bp
index 6e013b8..66665ed 100644
--- a/media/codec2/components/mp3/Android.bp
+++ b/media/codec2/components/mp3/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2mp3dec",
+ name: "libcodec2_soft_mp3dec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftMp3Dec.cpp"],
diff --git a/media/codec2/components/mpeg2/Android.bp b/media/codec2/components/mpeg2/Android.bp
index 85d867e..841f0a9 100644
--- a/media/codec2/components/mpeg2/Android.bp
+++ b/media/codec2/components/mpeg2/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2mpeg2dec",
+ name: "libcodec2_soft_mpeg2dec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_signed-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_signed-defaults",
],
srcs: ["C2SoftMpeg2Dec.cpp"],
diff --git a/media/codec2/components/mpeg4_h263/Android.bp b/media/codec2/components/mpeg4_h263/Android.bp
index 3155bc2..41e4f44 100644
--- a/media/codec2/components/mpeg4_h263/Android.bp
+++ b/media/codec2/components/mpeg4_h263/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2mpeg4dec",
+ name: "libcodec2_soft_mpeg4dec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_signed-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_signed-defaults",
],
srcs: ["C2SoftMpeg4Dec.cpp"],
@@ -16,10 +16,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2h263dec",
+ name: "libcodec2_soft_h263dec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_signed-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_signed-defaults",
],
srcs: ["C2SoftMpeg4Dec.cpp"],
@@ -32,10 +32,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2mpeg4enc",
+ name: "libcodec2_soft_mpeg4enc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_signed-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_signed-defaults",
],
@@ -50,10 +50,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2h263enc",
+ name: "libcodec2_soft_h263enc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_signed-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_signed-defaults",
],
srcs: ["C2SoftMpeg4Enc.cpp"],
diff --git a/media/codec2/components/opus/Android.bp b/media/codec2/components/opus/Android.bp
index a6233a6..240cdb9 100644
--- a/media/codec2/components/opus/Android.bp
+++ b/media/codec2/components/opus/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2opusdec",
+ name: "libcodec2_soft_opusdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftOpusDec.cpp"],
diff --git a/media/codec2/components/raw/Android.bp b/media/codec2/components/raw/Android.bp
index 150eb91..dc944da 100644
--- a/media/codec2/components/raw/Android.bp
+++ b/media/codec2/components/raw/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2rawdec",
+ name: "libcodec2_soft_rawdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftRawDec.cpp"],
diff --git a/media/codec2/components/vorbis/Android.bp b/media/codec2/components/vorbis/Android.bp
index 7477da6..a5f485d 100644
--- a/media/codec2/components/vorbis/Android.bp
+++ b/media/codec2/components/vorbis/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2vorbisdec",
+ name: "libcodec2_soft_vorbisdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftVorbisDec.cpp"],
diff --git a/media/codec2/components/vpx/Android.bp b/media/codec2/components/vpx/Android.bp
index c09f365..abfd379 100644
--- a/media/codec2/components/vpx/Android.bp
+++ b/media/codec2/components/vpx/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2vp9dec",
+ name: "libcodec2_soft_vp9dec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftVpxDec.cpp"],
@@ -15,10 +15,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2vp8dec",
+ name: "libcodec2_soft_vp8dec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftVpxDec.cpp"],
@@ -27,10 +27,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2vp9enc",
+ name: "libcodec2_soft_vp9enc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: [
@@ -44,10 +44,10 @@
}
cc_library_shared {
- name: "libstagefright_soft_c2vp8enc",
+ name: "libcodec2_soft_vp8enc",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: [
diff --git a/media/codec2/components/xaac/Android.bp b/media/codec2/components/xaac/Android.bp
index 19c12cf..7795cc1 100644
--- a/media/codec2/components/xaac/Android.bp
+++ b/media/codec2/components/xaac/Android.bp
@@ -1,8 +1,8 @@
cc_library_shared {
- name: "libstagefright_soft_c2xaacdec",
+ name: "libcodec2_soft_xaacdec",
defaults: [
- "libstagefright_soft_c2-defaults",
- "libstagefright_soft_c2_sanitize_all-defaults",
+ "libcodec2_soft-defaults",
+ "libcodec2_soft_sanitize_all-defaults",
],
srcs: ["C2SoftXaacDec.cpp"],