Also compile dav1d only 8bit depth color

Author: gc-locks

.idea/compiler.xml

@@ -14,6 +14,17 @@ android {
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
+    flavorDimensions "depth"
+    productFlavors {
+        full {
+            dimension "depth"
+        }
+        only8bpc {
+            dimension "depth"
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false

.idea/gradle.xml

@@ -15,6 +15,16 @@ android {
         testInstrumentationRunner 'androidx.benchmark.AndroidBenchmarkRunner'
     }
 
+    flavorDimensions "depth"
+    productFlavors {
+        full {
+            dimension "depth"
+        }
+        only8bpc {
+            dimension "depth"
+        }
+    }
+
     buildTypes {
         debug {
             // Since debuggable can't be modified by gradle for library modules,

.idea/misc.xml

@@ -1,19 +1,19 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'maven'
-
-def deployTo = new File(rootDir, "repository")
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "29.0.3"
-    ndkVersion "21.3.6528147"
+    ndkVersion "21.4.7075529"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -26,6 +26,26 @@ android {
         }
     }
 
+    flavorDimensions "depth"
+    productFlavors {
+        full {
+            dimension "depth"
+            externalNativeBuild {
+                cmake {
+                    arguments +='-DFLAVOR_DEPTH=full'
+                }
+            }
+        }
+        only8bpc {
+            dimension "depth"
+            externalNativeBuild {
+                cmake {
+                    arguments +='-DFLAVOR_DEPTH=only8bpc'
+                }
+            }
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -62,13 +82,28 @@ dependencies {
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            repository url: "file://${deployTo}"
-            pom.version = '0.8.0'
-            pom.groupId = 'jp.co.link_u.library.glideavif'
-            pom.artifactId = 'glideavif'
+def mavenVersion = '0.8.0'
+
+afterEvaluate {
+    publishing {
+        publications {
+            fullRelease(MavenPublication) {
+                groupId = 'jp.co.link_u.library.glideavif'
+                artifactId = 'glideavif'
+                version = mavenVersion
+                from components.fullRelease
+            }
+            only8bpcRelease(MavenPublication) {
+                groupId = 'jp.co.link_u.library.glideavif'
+                artifactId = 'glideavif-8bpc'
+                version = mavenVersion
+                from components.only8bpcRelease
+            }
+        }
+        repositories {
+            maven {
+                url = uri("$rootDir/repository")
+            }
         }
     }
-}
+}

app/build.gradle

@@ -1,5 +1,4 @@
 ```shell
 docker-compose up --build
-cp -rf build/lib/* ../src/main/cpp/lib/
-cp -rf build/include/arm64-v8a/dav1d/* ../src/main/cpp/include/dav1d/
+cp -rf build/* ../src/main/cpp/libdav1d/
 ```

benchmark/build.gradle

@@ -5,7 +5,7 @@ services:
     build:
       context: docker
       args: &args
-        NDK: r21d
+        NDK: r21e
         DAV1D_VERSION: 0.8.2
         CLANG: "%CPU_FAMILY-linux-android%API_LEVEL-clang"
         UTIL: "%CPU_FAMILY-linux-android"
@@ -14,13 +14,25 @@ services:
         API_LEVEL: 21
         ARCH: arm64-v8a
         LIBTYPE: static
+        DEPTH: "['8','16']"
+        DEPTH_NAME: full
     volumes:
       - ./build:/mnt/libdav1d
 
-  armeabi-v7a:
+  arm64-v8a-8bpc:
     build:
       context: docker
       args:
+        <<: *args
+        DEPTH: "['8']"
+        DEPTH_NAME: only8bpc
+    volumes:
+      - ./build:/mnt/libdav1d
+
+  armeabi-v7a:
+    build:
+      context: docker
+      args: &armv7
         <<: *args
         CLANG: "%CPU_FAMILY-linux-androideabi%API_LEVEL-clang"
         UTIL: arm-linux-androideabi
@@ -31,21 +43,41 @@ services:
     volumes:
       - ./build:/mnt/libdav1d
 
-  x86_64:
+  armeabi-v7a-8bpc:
     build:
       context: docker
       args:
+        <<: *armv7
+        DEPTH: "['8']"
+        DEPTH_NAME: only8bpc
+    volumes:
+      - ./build:/mnt/libdav1d
+
+  x86_64:
+    build:
+      context: docker
+      args: &x64
         <<: *args
         CPU_FAMILY: x86_64
         CPU: i686
         ARCH: x86_64
     volumes:
       - ./build:/mnt/libdav1d
 
-  x86:
+  x86_64-8bpc:
     build:
       context: docker
       args:
+        <<: *x64
+        DEPTH: "['8']"
+        DEPTH_NAME: only8bpc
+    volumes:
+      - ./build:/mnt/libdav1d
+
+  x86:
+    build:
+      context: docker
+      args: &x86
         <<: *args
         CLANG: "%CPU-linux-android%API_LEVEL-clang"
         UTIL: "%CPU-linux-android"
@@ -55,3 +87,13 @@ services:
         ARCH: x86
     volumes:
       - ./build:/mnt/libdav1d
+
+  x86-8bpc:
+    build:
+      context: docker
+      args:
+        <<: *x86
+        DEPTH: "['8']"
+        DEPTH_NAME: only8bpc
+    volumes:
+      - ./build:/mnt/libdav1d

glideavif/build.gradle

@@ -39,17 +39,20 @@ RUN sed -i  \
     -e 's/%TOOLCHAIN_ROOT/\/usr\/local\/src\/android-ndk\/toolchains\/llvm\/prebuilt\/linux-x86_64/' dav1d_cross.txt
 
 ARG LIBTYPE
+ARG DEPTH
 RUN /root/.local/bin/meson .. \
+    "-Dbitdepths=${DEPTH}" \
     --cross-file dav1d_cross.txt \
     --default-library ${LIBTYPE} \
     --buildtype release && \
     ninja
 
 ARG ARCH
-RUN mkdir -p /opt/libdav1d/lib/${ARCH} /opt/libdav1d/include/${ARCH} && \
-    cp src/libdav1d.a /opt/libdav1d/lib/${ARCH}/ && \
-    cp -rf ../include/* /opt/libdav1d/include/${ARCH}/ && \
-    find /opt/libdav1d/include/${ARCH}/ -type f -not -name "*.h" -exec rm {} + && \
-    cp -rf include/* /opt/libdav1d/include/${ARCH}/
+ARG DEPTH_NAME
+RUN mkdir -p /opt/libdav1d/${DEPTH_NAME}/lib/${ARCH} /opt/libdav1d/${DEPTH_NAME}/include/${ARCH} && \
+    cp src/libdav1d.a /opt/libdav1d/${DEPTH_NAME}/lib/${ARCH}/ && \
+    cp -rf ../include/* /opt/libdav1d/${DEPTH_NAME}/include/${ARCH}/ && \
+    find /opt/libdav1d/${DEPTH_NAME}/include/${ARCH}/ -type f -not -name "*.h" -exec rm {} + && \
+    cp -rf include/* /opt/libdav1d/${DEPTH_NAME}/include/${ARCH}/
 
 CMD ["cp", "-rf", "/opt/libdav1d", "/mnt/"]

glideavif/libdav1d_builder/Readme.md

@@ -6,8 +6,8 @@ project(avif_decoder CXX)
 string(REPLACE "-Wl,--fatal-warnings " "" NOWARNING ${CMAKE_SHARED_LINKER_FLAGS})
 set(CMAKE_SHARED_LINKER_FLAGS ${NOWARNING})
 
-set(DAV1D_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(DAV1D_INCLUDES ${DAV1D_DIR}/include)
+set(DAV1D_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libdav1d/${FLAVOR_DEPTH})
+set(DAV1D_INCLUDES ${DAV1D_DIR}/include/${ANDROID_ABI})
 set(DAV1D_LIBS ${DAV1D_DIR}/lib/${ANDROID_ABI})
 set(YUV_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(YUV_INCLUDES ${YUV_DIR}/include)