update libdav1d to v0.9.2

link-u · Feb 9, 2022 · 669fdfb · 669fdfb
1 parent 9e32caf
commit 669fdfb
Show file tree

Hide file tree

Showing 115 changed files with 2,771 additions and 183 deletions.
diff --git a/Readme.md b/Readme.md
@@ -12,12 +12,12 @@ repositories {
 
 ...
 
-implementation 'jp.co.link_u.library.glideavif:glideavif:0.8.1'
+implementation 'jp.co.link_u.library.glideavif:glideavif:0.9.0'
 ```
 
 or
 ```
-implementation 'jp.co.link_u.library.glideavif:glideavif-8bpc:0.8.1'
+implementation 'jp.co.link_u.library.glideavif:glideavif-8bpc:0.9.0'
 ```
 
 `glideavif-8bpc` supports only 8bpc image. But, the library is lighter than full color depth.

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,13 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 32
     defaultConfig {
         applicationId "jp.co.link_u.library.glideavif.sample"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -41,12 +39,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation("com.github.bumptech.glide:glide:4.11.0") {
         exclude group: "com.android.support"
@@ -55,6 +53,6 @@ dependencies {
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
     implementation project(":glideavif")
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "com.github.bumptech.glide:okhttp3-integration:4.11.0"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -1,18 +1,15 @@
 apply plugin: 'com.android.library'
 apply plugin: 'androidx.benchmark'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+
 android {
-    compileSdkVersion 28
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 32
 
-        testInstrumentationRunner 'androidx.benchmark.AndroidBenchmarkRunner'
+        testInstrumentationRunner 'androidx.benchmark.junit4.AndroidBenchmarkRunner'
     }
 
     flavorDimensions "depth"
@@ -45,10 +42,10 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.benchmark:benchmark:1.0.0-alpha01'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.benchmark.junit4:1.0.0'
 
     implementation project(":glideavif")
     implementation("com.github.bumptech.glide:glide:4.11.0") {

diff --git a/build.gradle b/build.gradle
@@ -1,26 +1,24 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.5.30'
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'androidx.benchmark:benchmark-gradle-plugin:1.0.0-alpha01'
+        classpath 'androidx.benchmark:benchmark-gradle-plugin:1.1.0-beta02'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
 }
 

diff --git a/glideavif/build.gradle b/glideavif/build.gradle
@@ -1,21 +1,17 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-android-extensions'
     id 'kotlin-kapt'
     id 'maven-publish'
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "29.0.3"
-    ndkVersion "21.4.7075529"
+    compileSdkVersion 32
+    ndkVersion "23.1.7779620"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 32
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -55,7 +51,7 @@ android {
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.6.0"
+            version "3.18.1"
         }
     }
     kotlinOptions {
@@ -69,11 +65,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation("com.github.bumptech.glide:glide:4.11.0") {
         exclude group: "com.android.support"
@@ -82,7 +78,7 @@ dependencies {
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
 }
 
-def mavenVersion = '0.8.1'
+def mavenVersion = '0.9.0'
 
 afterEvaluate {
     publishing {

diff --git a/glideavif/libdav1d_builder/docker-compose.yml b/glideavif/libdav1d_builder/docker-compose.yml
@@ -5,8 +5,8 @@ services:
     build:
       context: docker
       args: &args
-        NDK: r21e
-        DAV1D_VERSION: 0.8.2
+        NDK: r23b
+        DAV1D_VERSION: 0.9.2
         CLANG: "%CPU_FAMILY-linux-android%API_LEVEL-clang"
         UTIL: "%CPU_FAMILY-linux-android"
         CPU_FAMILY: aarch64

diff --git a/glideavif/libdav1d_builder/docker/Dockerfile b/glideavif/libdav1d_builder/docker/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update \
 WORKDIR /usr/local/src
 
 ARG NDK
-RUN curl -SL https://dl.google.com/android/repository/android-ndk-${NDK}-linux-x86_64.zip > android-ndk-${NDK}-linux-x86_64.zip && \
+RUN curl -SL https://dl.google.com/android/repository/android-ndk-${NDK}-linux.zip > android-ndk-${NDK}-linux-x86_64.zip && \
     unzip -q android-ndk-${NDK}-linux-x86_64.zip && \
     mv android-ndk-${NDK} android-ndk && \
     rm android-ndk-${NDK}-linux-x86_64.zip

diff --git a/glideavif/libdav1d_builder/docker/dav1d_cross.txt b/glideavif/libdav1d_builder/docker/dav1d_cross.txt
@@ -1,11 +1,10 @@
 [binaries]
 c = '%TOOLCHAIN_ROOT/bin/%CLANG'
 cpp = '%TOOLCHAIN_ROOT/bin/%CLANG++'
-ar = '%TOOLCHAIN_ROOT/bin/%UTIL-ar'
+ar = '%TOOLCHAIN_ROOT/bin/llvm-ar'
 as = '%TOOLCHAIN_ROOT/bin/%UTIL-as'
-ld = '%TOOLCHAIN_ROOT/bin/%UTIL-ld'
-strip = '%TOOLCHAIN_ROOT/bin/%UTIL-strip'
-objcopy = '%TOOLCHAIN_ROOT/bin/%UTIL-objcopy'
+strip = '%TOOLCHAIN_ROOT/bin/llvm-strip'
+objcopy = '%TOOLCHAIN_ROOT/bin/llvm-objcopy'
 pkgconfig = 'false'
 
 [host_machine]

diff --git a/glideavif/libyuv_builder/docker-compose.yml b/glideavif/libyuv_builder/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: docker
       args: &args
-        NDK: r21d
+        NDK: r23b
         YUV_VERSION: c28d4049364d75710b1c49697a5814ab572af641
         API_LEVEL: 21
         ARCH: arm64-v8a

diff --git a/glideavif/libyuv_builder/docker/Dockerfile b/glideavif/libyuv_builder/docker/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \
 WORKDIR /usr/local/src
 
 ARG NDK
-RUN curl -SL https://dl.google.com/android/repository/android-ndk-${NDK}-linux-x86_64.zip > android-ndk-${NDK}-linux-x86_64.zip && \
+RUN curl -SL https://dl.google.com/android/repository/android-ndk-${NDK}-linux.zip > android-ndk-${NDK}-linux-x86_64.zip && \
     unzip -q android-ndk-${NDK}-linux-x86_64.zip && \
     mv android-ndk-${NDK} android-ndk && \
     rm android-ndk-${NDK}-linux-x86_64.zip