commit f3b4d443768238e750d1617c6ec8bef8bcf5fa61
author Harish Mahendrakar <hmahendrakar@google.com> Tue Oct 24 17:47:04 2023 +0000
committer Harish Mahendrakar <hmahendrakar@google.com> Thu Oct 26 23:16:05 2023 +0000
tree 7ae2ac7b7acdddc827c6fda513e95c2b9fbe210d
parent 5675e331586ec4ef621a8cf4980c249fd3306627

Enable dav1d decoder as another av1 decoder

This CL enables c2 plugin for dav1d decoder but still keeps the
current gav1 decoder as default

createCodecByName() with "c2.android.av1-dav1d.decoder" can be used
to pick dav1d c2 decoder.

Bug: 289716589
Test: stagefright -s av1.webm -N c2.android.av1-dav1d.decoder

Change-Id: Ia76f781f5046d51c78f851730789a62d8089e122

media/codec2/components/dav1d/Android.bp

diff --git a/media/codec2/components/dav1d/Android.bp b/media/codec2/components/dav1d/Android.bp
index c9387dd..d549ccb 100644
--- a/media/codec2/components/dav1d/Android.bp
+++ b/media/codec2/components/dav1d/Android.bp
@@ -9,8 +9,6 @@
 
 cc_library {
     name: "libcodec2_soft_av1dec_dav1d",
-    // TODO: b/277797541 - enable once ready
-    enabled: false,
 
     defaults: [
         "libcodec2_soft-defaults",
@@ -19,19 +17,12 @@
     ],
 
     cflags: [
-        "-DCODECNAME=\"c2.android.dav1d-av1.decoder\"",
+        "-DCODECNAME=\"c2.android.av1-dav1d.decoder\"",
         "-Wno-unused-variable",
     ],
 
     srcs: ["C2SoftDav1dDec.cpp", "C2SoftDav1dDump.cpp"],
     static_libs: [
-        "libdav1d_8bit",
-        "libdav1d_16bit",
+        "libdav1d",
     ],
-
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.media.swcodec",
-    ],
-
 }