Switch av1 implementations from aom to gav1

Deprecate the aom implementation in favor of the faster/smaller gav1
implementation.

Bug: 130249450
Bug: 131989882
Test: playback multiple av1 clips
Change-Id: I04a3507376e32b1f7a037809cbb7848e65a404e5
gugelfrei
Ray Essick 5 years ago
parent 2f0fa55f83
commit c2cc437a64

@ -1,10 +1,16 @@
cc_library_shared {
name: "libcodec2_soft_av1dec",
name: "libcodec2_soft_av1dec_aom",
defaults: [
"libcodec2_soft-defaults",
"libcodec2_soft_sanitize_all-defaults",
],
// coordinated with frameworks/av/media/codec2/components/gav1/Android.bp
// so only 1 of them has the official c2.android.av1.decoder name
cflags: [
"-DCODECNAME=\"c2.android.av1-aom.decoder\"",
],
srcs: ["C2SoftAomDec.cpp"],
static_libs: ["libaom"],

@ -29,7 +29,8 @@
namespace android {
constexpr char COMPONENT_NAME[] = "c2.android.av1.decoder";
// codecname set and passed in as a compile flag from Android.bp
constexpr char COMPONENT_NAME[] = CODECNAME;
class C2SoftAomDec::IntfImpl : public SimpleInterface<void>::BaseParams {
public:

@ -1,10 +1,16 @@
cc_library_shared {
name: "libcodec2_soft_gav1dec",
name: "libcodec2_soft_av1dec_gav1",
defaults: [
"libcodec2_soft-defaults",
"libcodec2_soft_sanitize_all-defaults",
],
// coordinated with frameworks/av/media/codec2/components/aom/Android.bp
// so only 1 of them has the official c2.android.av1.decoder name
cflags: [
"-DCODECNAME=\"c2.android.av1.decoder\"",
],
srcs: ["C2SoftGav1Dec.cpp"],
static_libs: ["libgav1"],

@ -27,7 +27,8 @@
namespace android {
constexpr char COMPONENT_NAME[] = "c2.android.gav1.decoder";
// codecname set and passed in as a compile flag from Android.bp
constexpr char COMPONENT_NAME[] = CODECNAME;
class C2SoftGav1Dec::IntfImpl : public SimpleInterface<void>::BaseParams {
public:

@ -848,8 +848,8 @@ C2PlatformComponentStore::C2PlatformComponentStore()
emplace("libcodec2_soft_amrnbenc.so");
emplace("libcodec2_soft_amrwbdec.so");
emplace("libcodec2_soft_amrwbenc.so");
emplace("libcodec2_soft_av1dec.so");
emplace("libcodec2_soft_gav1dec.so");
//emplace("libcodec2_soft_av1dec_aom.so"); // deprecated for the gav1 implementation
emplace("libcodec2_soft_av1dec_gav1.so");
emplace("libcodec2_soft_avcdec.so");
emplace("libcodec2_soft_avcenc.so");
emplace("libcodec2_soft_flacdec.so");

@ -77,7 +77,7 @@
<Limit name="bitrate" range="1-40000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="c2.android.gav1.decoder" type="video/av01">
<MediaCodec name="c2.android.av1.decoder" type="video/av01">
<Limit name="size" min="96x96" max="1920x1080" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />

@ -182,7 +182,7 @@
</Variant>
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="c2.android.gav1.decoder" type="video/av01" variant="!slow-cpu">
<MediaCodec name="c2.android.av1.decoder" type="video/av01" variant="!slow-cpu">
<Limit name="size" min="2x2" max="1920x1080" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />

@ -42,8 +42,8 @@ cc_library_shared {
"libcodec2_soft_opusenc",
"libcodec2_soft_vp8dec",
"libcodec2_soft_vp9dec",
"libcodec2_soft_av1dec",
"libcodec2_soft_gav1dec",
// "libcodec2_soft_av1dec_aom", // replaced by the gav1 implementation
"libcodec2_soft_av1dec_gav1",
"libcodec2_soft_vp8enc",
"libcodec2_soft_vp9enc",
"libcodec2_soft_rawdec",

Loading…
Cancel
Save