Make Codec2 software service public
This CL makes the software Codec2 service present the public Codec2 HAL
interface, and makes the framework use it.
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 112362730
Bug: 119853704
Change-Id: I047c6948a883a6e085d988a3fa542129ebb9571f
diff --git a/media/codec2/vndk/C2Store.cpp b/media/codec2/vndk/C2Store.cpp
index 33019ed..2d4e19e 100644
--- a/media/codec2/vndk/C2Store.cpp
+++ b/media/codec2/vndk/C2Store.cpp
@@ -798,65 +798,65 @@
mComponentsList.emplace_back(alias);
};
// TODO: move this also into a .so so it can be updated
- emplace("c2.android.avc.decoder", "libstagefright_soft_c2avcdec.so");
- emplace("c2.android.avc.encoder", "libstagefright_soft_c2avcenc.so");
- emplace("c2.android.aac.decoder", "libstagefright_soft_c2aacdec.so");
- emplace("c2.android.aac.encoder", "libstagefright_soft_c2aacenc.so");
- emplace("c2.android.amrnb.decoder", "libstagefright_soft_c2amrnbdec.so");
- emplace("c2.android.amrnb.encoder", "libstagefright_soft_c2amrnbenc.so");
- emplace("c2.android.amrwb.decoder", "libstagefright_soft_c2amrwbdec.so");
- emplace("c2.android.amrwb.encoder", "libstagefright_soft_c2amrwbenc.so");
- emplace("c2.android.hevc.decoder", "libstagefright_soft_c2hevcdec.so");
- emplace("c2.android.g711.alaw.decoder", "libstagefright_soft_c2g711alawdec.so");
- emplace("c2.android.g711.mlaw.decoder", "libstagefright_soft_c2g711mlawdec.so");
- emplace("c2.android.mpeg2.decoder", "libstagefright_soft_c2mpeg2dec.so");
- emplace("c2.android.h263.decoder", "libstagefright_soft_c2h263dec.so");
- emplace("c2.android.h263.encoder", "libstagefright_soft_c2h263enc.so");
- emplace("c2.android.mpeg4.decoder", "libstagefright_soft_c2mpeg4dec.so");
- emplace("c2.android.mpeg4.encoder", "libstagefright_soft_c2mpeg4enc.so");
- emplace("c2.android.mp3.decoder", "libstagefright_soft_c2mp3dec.so");
- emplace("c2.android.vorbis.decoder", "libstagefright_soft_c2vorbisdec.so");
- emplace("c2.android.opus.decoder", "libstagefright_soft_c2opusdec.so");
- emplace("c2.android.vp8.decoder", "libstagefright_soft_c2vp8dec.so");
- emplace("c2.android.vp9.decoder", "libstagefright_soft_c2vp9dec.so");
- emplace("c2.android.vp8.encoder", "libstagefright_soft_c2vp8enc.so");
- emplace("c2.android.vp9.encoder", "libstagefright_soft_c2vp9enc.so");
- emplace("c2.android.raw.decoder", "libstagefright_soft_c2rawdec.so");
- emplace("c2.android.flac.decoder", "libstagefright_soft_c2flacdec.so");
- emplace("c2.android.flac.encoder", "libstagefright_soft_c2flacenc.so");
- emplace("c2.android.gsm.decoder", "libstagefright_soft_c2gsmdec.so");
- emplace("c2.android.xaac.decoder", "libstagefright_soft_c2xaacdec.so");
+ emplace("c2.android.avc.decoder", "libcodec2_soft_avcdec.so");
+ emplace("c2.android.avc.encoder", "libcodec2_soft_avcenc.so");
+ emplace("c2.android.aac.decoder", "libcodec2_soft_aacdec.so");
+ emplace("c2.android.aac.encoder", "libcodec2_soft_aacenc.so");
+ emplace("c2.android.amrnb.decoder", "libcodec2_soft_amrnbdec.so");
+ emplace("c2.android.amrnb.encoder", "libcodec2_soft_amrnbenc.so");
+ emplace("c2.android.amrwb.decoder", "libcodec2_soft_amrwbdec.so");
+ emplace("c2.android.amrwb.encoder", "libcodec2_soft_amrwbenc.so");
+ emplace("c2.android.hevc.decoder", "libcodec2_soft_hevcdec.so");
+ emplace("c2.android.g711.alaw.decoder", "libcodec2_soft_g711alawdec.so");
+ emplace("c2.android.g711.mlaw.decoder", "libcodec2_soft_g711mlawdec.so");
+ emplace("c2.android.mpeg2.decoder", "libcodec2_soft_mpeg2dec.so");
+ emplace("c2.android.h263.decoder", "libcodec2_soft_h263dec.so");
+ emplace("c2.android.h263.encoder", "libcodec2_soft_h263enc.so");
+ emplace("c2.android.mpeg4.decoder", "libcodec2_soft_mpeg4dec.so");
+ emplace("c2.android.mpeg4.encoder", "libcodec2_soft_mpeg4enc.so");
+ emplace("c2.android.mp3.decoder", "libcodec2_soft_mp3dec.so");
+ emplace("c2.android.vorbis.decoder", "libcodec2_soft_vorbisdec.so");
+ emplace("c2.android.opus.decoder", "libcodec2_soft_opusdec.so");
+ emplace("c2.android.vp8.decoder", "libcodec2_soft_vp8dec.so");
+ emplace("c2.android.vp9.decoder", "libcodec2_soft_vp9dec.so");
+ emplace("c2.android.vp8.encoder", "libcodec2_soft_vp8enc.so");
+ emplace("c2.android.vp9.encoder", "libcodec2_soft_vp9enc.so");
+ emplace("c2.android.raw.decoder", "libcodec2_soft_rawdec.so");
+ emplace("c2.android.flac.decoder", "libcodec2_soft_flacdec.so");
+ emplace("c2.android.flac.encoder", "libcodec2_soft_flacenc.so");
+ emplace("c2.android.gsm.decoder", "libcodec2_soft_gsmdec.so");
+ emplace("c2.android.xaac.decoder", "libcodec2_soft_xaacdec.so");
// "Aliases"
// TODO: use aliases proper from C2Component::Traits
- emplace("OMX.google.h264.decoder", "libstagefright_soft_c2avcdec.so");
- emplace("OMX.google.h264.encoder", "libstagefright_soft_c2avcenc.so");
- emplace("OMX.google.aac.decoder", "libstagefright_soft_c2aacdec.so");
- emplace("OMX.google.aac.encoder", "libstagefright_soft_c2aacenc.so");
- emplace("OMX.google.amrnb.decoder", "libstagefright_soft_c2amrnbdec.so");
- emplace("OMX.google.amrnb.encoder", "libstagefright_soft_c2amrnbenc.so");
- emplace("OMX.google.amrwb.decoder", "libstagefright_soft_c2amrwbdec.so");
- emplace("OMX.google.amrwb.encoder", "libstagefright_soft_c2amrwbenc.so");
- emplace("OMX.google.hevc.decoder", "libstagefright_soft_c2hevcdec.so");
- emplace("OMX.google.g711.alaw.decoder", "libstagefright_soft_c2g711alawdec.so");
- emplace("OMX.google.g711.mlaw.decoder", "libstagefright_soft_c2g711mlawdec.so");
- emplace("OMX.google.mpeg2.decoder", "libstagefright_soft_c2mpeg2dec.so");
- emplace("OMX.google.h263.decoder", "libstagefright_soft_c2h263dec.so");
- emplace("OMX.google.h263.encoder", "libstagefright_soft_c2h263enc.so");
- emplace("OMX.google.mpeg4.decoder", "libstagefright_soft_c2mpeg4dec.so");
- emplace("OMX.google.mpeg4.encoder", "libstagefright_soft_c2mpeg4enc.so");
- emplace("OMX.google.mp3.decoder", "libstagefright_soft_c2mp3dec.so");
- emplace("OMX.google.vorbis.decoder", "libstagefright_soft_c2vorbisdec.so");
- emplace("OMX.google.opus.decoder", "libstagefright_soft_c2opusdec.so");
- emplace("OMX.google.vp8.decoder", "libstagefright_soft_c2vp8dec.so");
- emplace("OMX.google.vp9.decoder", "libstagefright_soft_c2vp9dec.so");
- emplace("OMX.google.vp8.encoder", "libstagefright_soft_c2vp8enc.so");
- emplace("OMX.google.vp9.encoder", "libstagefright_soft_c2vp9enc.so");
- emplace("OMX.google.raw.decoder", "libstagefright_soft_c2rawdec.so");
- emplace("OMX.google.flac.decoder", "libstagefright_soft_c2flacdec.so");
- emplace("OMX.google.flac.encoder", "libstagefright_soft_c2flacenc.so");
- emplace("OMX.google.gsm.decoder", "libstagefright_soft_c2gsmdec.so");
- emplace("OMX.google.xaac.decoder", "libstagefright_soft_c2xaacdec.so");
+ emplace("OMX.google.h264.decoder", "libcodec2_soft_avcdec.so");
+ emplace("OMX.google.h264.encoder", "libcodec2_soft_avcenc.so");
+ emplace("OMX.google.aac.decoder", "libcodec2_soft_aacdec.so");
+ emplace("OMX.google.aac.encoder", "libcodec2_soft_aacenc.so");
+ emplace("OMX.google.amrnb.decoder", "libcodec2_soft_amrnbdec.so");
+ emplace("OMX.google.amrnb.encoder", "libcodec2_soft_amrnbenc.so");
+ emplace("OMX.google.amrwb.decoder", "libcodec2_soft_amrwbdec.so");
+ emplace("OMX.google.amrwb.encoder", "libcodec2_soft_amrwbenc.so");
+ emplace("OMX.google.hevc.decoder", "libcodec2_soft_hevcdec.so");
+ emplace("OMX.google.g711.alaw.decoder", "libcodec2_soft_g711alawdec.so");
+ emplace("OMX.google.g711.mlaw.decoder", "libcodec2_soft_g711mlawdec.so");
+ emplace("OMX.google.mpeg2.decoder", "libcodec2_soft_mpeg2dec.so");
+ emplace("OMX.google.h263.decoder", "libcodec2_soft_h263dec.so");
+ emplace("OMX.google.h263.encoder", "libcodec2_soft_h263enc.so");
+ emplace("OMX.google.mpeg4.decoder", "libcodec2_soft_mpeg4dec.so");
+ emplace("OMX.google.mpeg4.encoder", "libcodec2_soft_mpeg4enc.so");
+ emplace("OMX.google.mp3.decoder", "libcodec2_soft_mp3dec.so");
+ emplace("OMX.google.vorbis.decoder", "libcodec2_soft_vorbisdec.so");
+ emplace("OMX.google.opus.decoder", "libcodec2_soft_opusdec.so");
+ emplace("OMX.google.vp8.decoder", "libcodec2_soft_vp8dec.so");
+ emplace("OMX.google.vp9.decoder", "libcodec2_soft_vp9dec.so");
+ emplace("OMX.google.vp8.encoder", "libcodec2_soft_vp8enc.so");
+ emplace("OMX.google.vp9.encoder", "libcodec2_soft_vp9enc.so");
+ emplace("OMX.google.raw.decoder", "libcodec2_soft_rawdec.so");
+ emplace("OMX.google.flac.decoder", "libcodec2_soft_flacdec.so");
+ emplace("OMX.google.flac.encoder", "libcodec2_soft_flacenc.so");
+ emplace("OMX.google.gsm.decoder", "libcodec2_soft_gsmdec.so");
+ emplace("OMX.google.xaac.decoder", "libcodec2_soft_xaacdec.so");
}
c2_status_t C2PlatformComponentStore::copyBuffer(