Skip to content

Commit 669fdfb

Browse files
yuk-inoue-amulinkyuk-inoue-amulink
committed
update libdav1d to v0.9.2
1 parent 9e32caf commit 669fdfb

115 files changed

Lines changed: 2771 additions & 183 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ repositories {
1212
1313
...
1414
15-
implementation 'jp.co.link_u.library.glideavif:glideavif:0.8.1'
15+
implementation 'jp.co.link_u.library.glideavif:glideavif:0.9.0'
1616
```
1717

1818
or
1919
```
20-
implementation 'jp.co.link_u.library.glideavif:glideavif-8bpc:0.8.1'
20+
implementation 'jp.co.link_u.library.glideavif:glideavif-8bpc:0.9.0'
2121
```
2222

2323
`glideavif-8bpc` supports only 8bpc image. But, the library is lighter than full color depth.

‎app/build.gradle‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43
apply plugin: 'kotlin-kapt'
54

65
android {
7-
compileSdkVersion 29
8-
buildToolsVersion "29.0.2"
6+
compileSdkVersion 32
97
defaultConfig {
108
applicationId "jp.co.link_u.library.glideavif.sample"
119
minSdkVersion 16
12-
targetSdkVersion 29
10+
targetSdkVersion 32
1311
versionCode 1
1412
versionName "1.0"
1513
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -41,12 +39,12 @@ android {
4139
dependencies {
4240
implementation fileTree(dir: 'libs', include: ['*.jar'])
4341
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
44-
implementation 'androidx.appcompat:appcompat:1.0.2'
45-
implementation 'androidx.core:core-ktx:1.0.2'
46-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
47-
testImplementation 'junit:junit:4.12'
48-
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
49-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
42+
implementation 'androidx.appcompat:appcompat:1.4.1'
43+
implementation 'androidx.core:core-ktx:1.7.0'
44+
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
45+
testImplementation 'junit:junit:4.13.2'
46+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
47+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
5048

5149
implementation("com.github.bumptech.glide:glide:4.11.0") {
5250
exclude group: "com.android.support"
@@ -55,6 +53,6 @@ dependencies {
5553
kapt 'com.github.bumptech.glide:compiler:4.11.0'
5654

5755
implementation project(":glideavif")
58-
implementation 'androidx.recyclerview:recyclerview:1.1.0'
56+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
5957
implementation "com.github.bumptech.glide:okhttp3-integration:4.11.0"
6058
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
android:roundIcon="@mipmap/ic_launcher_round"
1212
android:supportsRtl="true"
1313
android:theme="@style/AppTheme">
14-
<activity android:name=".MainActivity">
14+
<activity
15+
android:name=".MainActivity"
16+
android:exported="true">
1517
<intent-filter>
1618
<action android:name="android.intent.action.MAIN" />
1719

‎benchmark/build.gradle‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'androidx.benchmark'
33
apply plugin: 'kotlin-android'
4-
apply plugin: 'kotlin-android-extensions'
4+
55
android {
6-
compileSdkVersion 28
7-
buildToolsVersion "29.0.2"
6+
compileSdkVersion 32
87

98
defaultConfig {
109
minSdkVersion 18
11-
targetSdkVersion 28
12-
versionCode 1
13-
versionName "1.0"
10+
targetSdkVersion 32
1411

15-
testInstrumentationRunner 'androidx.benchmark.AndroidBenchmarkRunner'
12+
testInstrumentationRunner 'androidx.benchmark.junit4.AndroidBenchmarkRunner'
1613
}
1714

1815
flavorDimensions "depth"
@@ -45,10 +42,10 @@ dependencies {
4542

4643
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4744

48-
androidTestImplementation 'androidx.test:runner:1.1.1'
49-
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
50-
androidTestImplementation 'junit:junit:4.12'
51-
androidTestImplementation 'androidx.benchmark:benchmark:1.0.0-alpha01'
45+
androidTestImplementation 'androidx.test:runner:1.4.0'
46+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
47+
androidTestImplementation 'junit:junit:4.13.2'
48+
androidTestImplementation 'androidx.benchmark.junit4:1.0.0'
5249

5350
implementation project(":glideavif")
5451
implementation("com.github.bumptech.glide:glide:4.11.0") {

‎build.gradle‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.72'
4+
ext.kotlin_version = '1.5.30'
55
repositories {
66
google()
7-
jcenter()
8-
7+
mavenCentral()
98
}
109
dependencies {
11-
classpath 'com.android.tools.build:gradle:4.0.0'
10+
classpath 'com.android.tools.build:gradle:7.1.1'
1211
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1312
// NOTE: Do not place your application dependencies here; they belong
1413
// in the individual module build.gradle files
15-
classpath 'androidx.benchmark:benchmark-gradle-plugin:1.0.0-alpha01'
14+
classpath 'androidx.benchmark:benchmark-gradle-plugin:1.1.0-beta02'
1615
}
1716
}
1817

1918
allprojects {
2019
repositories {
2120
google()
22-
jcenter()
23-
21+
mavenCentral()
2422
}
2523
}
2624

‎glideavif/build.gradle‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
4-
id 'kotlin-android-extensions'
54
id 'kotlin-kapt'
65
id 'maven-publish'
76
}
87

98
android {
10-
compileSdkVersion 30
11-
buildToolsVersion "29.0.3"
12-
ndkVersion "21.4.7075529"
9+
compileSdkVersion 32
10+
ndkVersion "23.1.7779620"
1311

1412
defaultConfig {
1513
minSdkVersion 16
16-
targetSdkVersion 30
17-
versionCode 1
18-
versionName "1.0"
14+
targetSdkVersion 32
1915

2016
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2117
consumerProguardFiles 'consumer-rules.pro'
@@ -55,7 +51,7 @@ android {
5551
externalNativeBuild {
5652
cmake {
5753
path "src/main/cpp/CMakeLists.txt"
58-
version "3.6.0"
54+
version "3.18.1"
5955
}
6056
}
6157
kotlinOptions {
@@ -69,11 +65,11 @@ android {
6965
dependencies {
7066
implementation fileTree(dir: 'libs', include: ['*.jar'])
7167
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
72-
implementation 'androidx.appcompat:appcompat:1.1.0'
73-
implementation 'androidx.core:core-ktx:1.3.0'
74-
testImplementation 'junit:junit:4.13'
75-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
76-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
68+
implementation 'androidx.appcompat:appcompat:1.4.1'
69+
implementation 'androidx.core:core-ktx:1.7.0'
70+
testImplementation 'junit:junit:4.13.2'
71+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
72+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
7773

7874
implementation("com.github.bumptech.glide:glide:4.11.0") {
7975
exclude group: "com.android.support"
@@ -82,7 +78,7 @@ dependencies {
8278
kapt 'com.github.bumptech.glide:compiler:4.11.0'
8379
}
8480

85-
def mavenVersion = '0.8.1'
81+
def mavenVersion = '0.9.0'
8682

8783
afterEvaluate {
8884
publishing {

‎glideavif/libdav1d_builder/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ services:
55
build:
66
context: docker
77
args: &args
8-
NDK: r21e
9-
DAV1D_VERSION: 0.8.2
8+
NDK: r23b
9+
DAV1D_VERSION: 0.9.2
1010
CLANG: "%CPU_FAMILY-linux-android%API_LEVEL-clang"
1111
UTIL: "%CPU_FAMILY-linux-android"
1212
CPU_FAMILY: aarch64

‎glideavif/libdav1d_builder/docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt-get update \
77
WORKDIR /usr/local/src
88

99
ARG NDK
10-
RUN curl -SL https://dl.google.com/android/repository/android-ndk-${NDK}-linux-x86_64.zip > android-ndk-${NDK}-linux-x86_64.zip && \
10+
RUN curl -SL https://dl.google.com/android/repository/android-ndk-${NDK}-linux.zip > android-ndk-${NDK}-linux-x86_64.zip && \
1111
unzip -q android-ndk-${NDK}-linux-x86_64.zip && \
1212
mv android-ndk-${NDK} android-ndk && \
1313
rm android-ndk-${NDK}-linux-x86_64.zip

‎glideavif/libdav1d_builder/docker/dav1d_cross.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
[binaries]
22
c = '%TOOLCHAIN_ROOT/bin/%CLANG'
33
cpp = '%TOOLCHAIN_ROOT/bin/%CLANG++'
4-
ar = '%TOOLCHAIN_ROOT/bin/%UTIL-ar'
4+
ar = '%TOOLCHAIN_ROOT/bin/llvm-ar'
55
as = '%TOOLCHAIN_ROOT/bin/%UTIL-as'
6-
ld = '%TOOLCHAIN_ROOT/bin/%UTIL-ld'
7-
strip = '%TOOLCHAIN_ROOT/bin/%UTIL-strip'
8-
objcopy = '%TOOLCHAIN_ROOT/bin/%UTIL-objcopy'
6+
strip = '%TOOLCHAIN_ROOT/bin/llvm-strip'
7+
objcopy = '%TOOLCHAIN_ROOT/bin/llvm-objcopy'
98
pkgconfig = 'false'
109

1110
[host_machine]

‎glideavif/libyuv_builder/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
build:
66
context: docker
77
args: &args
8-
NDK: r21d
8+
NDK: r23b
99
YUV_VERSION: c28d4049364d75710b1c49697a5814ab572af641
1010
API_LEVEL: 21
1111
ARCH: arm64-v8a

0 commit comments

Comments
 (0)