Status Update
Comments
fu...@google.com <fu...@google.com> #2
Kotlin 1.3.5.0
lifecyle = 2.2.0-rc02
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.lifecycle}"
implementation "androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}"
implementation "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}"
class VideoModel(val app: Application) : AndroidViewModel(app) {
// do something
}
sc...@gmail.com <sc...@gmail.com> #3
This is lifecyle-viewmodel-kts build dependency, where lifecycle-viewmodel is added (as API).
This is lifecycle-viewmodel build, and there proguard rule is applied to all build types.
and finally, this is the configuration:
```
-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.AndroidViewModel {
<init>(android.app.Application);
}
```
Because of that rule, at least instance initializer of your class that extends AndroidViewModel would be kept as long as that class itself is used/kept somehow. That's one notable difference between `-keepclassmemebers` v.s. other keep directives such as `-keep` or `-keepclasseswithmembers`.
But those rules are coming from the library, so I assume it's been there for a while (though you're using lifecycle 2.2.0-rc02, is it something you recently upgraded?) Then, the difference we should track is why `VideoModel` was kept at AGP 3.5.2 and is not now at AGP 3.6.0-beta04.
Could you add the following rule to your `proguard-rules.pro` and build your app again with AGP 3.5.2?
```
-whyareyoukeeping class **.VideoModel
```
To make sure rules from lifecycle-viewmodel is included as well, could you also add the following to literally print all configurations?
```
-printconfiguration all-configurations.txt
```
If you think it reveals too much details of your apps, you can send it to jsjeon@google.com privately, instead of posting it here. Thanks.
fu...@google.com <fu...@google.com> #4
I added printconfiguration all-configurations.txt then compare on AS all-configurations-3.5.2.txt vs all-configurations-3.6.0-beta04.txt. Proguard config of ViewModel was consumed.
The different:
all-configurations-3.6.0-beta04.txt
# When editing this file, update the following files as well:
# - META-INF/com.android.tools/proguard/
# - META-INF/proguard/
all-configurations-3.5.2.txt
# Files in this directory will be ignored starting with Android Gradle Plugin 3.6.0+
# When editing this file, update the following files as well for AGP 3.6.0+:
# - META-INF/com.android.tools/proguard/
# - META-INF/com.android.tools/r8-upto-1.6.0/
and all-configurations-3.6.0-beta04.txt missed that was added in all-configurations-3.5.2.txt.
This the part missing:
# This is a configuration file for ProGuard.
#
#
# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with
# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and
# will be ignored by new version of the Android plugin for Gradle.
# Optimization is turned off by default. Dex does not like code run
# through the ProGuard optimize steps (and performs some
# of these optimizations on its own).
# Note that if you want to enable optimization, you cannot just
# include optimization flags in your own project configuration file;
# instead you will need to point to the
# "proguard-android-optimize.txt" file instead of this one from your
# project.properties file.
-dontoptimize
-dontusemixedcaseclassnames
-dontskipnonpubliclibraryclasses
-verbose
# Preserve some attributes that may be required for reflection.
-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
-keep public class com.google.vending.licensing.ILicensingService
-keep public class com.android.vending.licensing.ILicensingService
-keep public class com.google.android.vending.licensing.ILicensingService
-dontnote com.android.vending.licensing.ILicensingService
-dontnote com.google.vending.licensing.ILicensingService
-dontnote com.google.android.vending.licensing.ILicensingService
# For native methods, see
-keepclasseswithmembernames class * {
native <methods>;
}
# Keep setters in Views so that animations can still work.
-keepclassmembers public class * extends android.view.View {
void set*(***);
*** get*();
}
# We want to keep methods in Activity that could be used in the XML attribute onClick.
-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
}
# For enumeration classes, see
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
-keepclassmembers class * implements android.os.Parcelable {
public static final ** CREATOR;
}
-keepclassmembers class **.R$* {
public static <fields>;
}
# Preserve annotated Javascript interface methods.
-keepclassmembers class * {
@android.webkit.JavascriptInterface <methods>;
}
# The support libraries contains references to newer platform versions.
# Don't warn about those in case this app is linking against an older
# platform version. We know about them, and they are safe.
-dontnote android.support.**
-dontnote androidx.**
-dontwarn android.support.**
-dontwarn androidx.**
# This class is deprecated, but remains for backward compatibility.
-dontwarn android.util.FloatMath
# Understand the @Keep support annotation.
-keep class android.support.annotation.Keep
-keep class androidx.annotation.Keep
-keep @android.support.annotation.Keep class * {*;}
-keep @androidx.annotation.Keep class * {*;}
-keepclasseswithmembers class * {
@android.support.annotation.Keep <methods>;
}
-keepclasseswithmembers class * {
@androidx.annotation.Keep <methods>;
}
-keepclasseswithmembers class * {
@android.support.annotation.Keep <fields>;
}
-keepclasseswithmembers class * {
@androidx.annotation.Keep <fields>;
}
-keepclasseswithmembers class * {
@android.support.annotation.Keep <init>(...);
}
-keepclasseswithmembers class * {
@androidx.annotation.Keep <init>(...);
}
# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
-dontnote org.apache.http.**
-dontnote android.net.http.**
# These classes are duplicated between android.jar and core-lambda-stubs.jar.
-dontnote java.lang.invoke.**
I have another project that has the same config but it hadn't the problem with AGP 3.6.0-beta04. I will try to investigate more.
I think it can the same this problem before:
Below is the full log
E/TAG: java.lang.RuntimeException: Cannot create an instance of class com.myapp.screenrecorder.taskmedia.video.s
at androidx.lifecycle.M.a(ViewModelProvider.java:9)
at androidx.lifecycle.I.a(SavedStateViewModelFactory.java:4)
at androidx.lifecycle.Q.a(ViewModelProvider.java:8)
at com.myapp.screenrecorder.taskmedia.video.b.invoke(com.android.tools.r8.jetbrains.kotlin-style lambda group:1)
at kotlin.l.getValue(Lazy.kt:2)
at com.myapp.screenrecorder.taskmedia.video.VideoFragment.e(VideoFragment.kt:1)
at com.myapp.screenrecorder.taskmedia.video.g.c(VideoFragment.kt:11)
at kotlin.coroutines.jvm.internal.a.a(ContinuationImpl.kt:3)
at kotlinx.coroutines.K.a(Dispatched.kt:18)
at com.myapp.simplefilechooser.g.a(Unknown Source:20)
at kotlinx.coroutines.a.a(AbstractCoroutine.kt:21)
at kotlinx.coroutines.d.a(Unknown Source:16)
at com.myapp.screenrecorder.taskmedia.video.VideoFragment.d0(VideoFragment.kt:1)
at com.myapp.screenrecorder.taskmedia.video.VideoFragment.a(VideoFragment.kt:18)
at androidx.fragment.app.T.a(FragmentStateManager.java:51)
at androidx.fragment.app.K.a(FragmentManager.java:176)
at androidx.fragment.app.K.a(FragmentManager.java:426)
at androidx.fragment.app.K.a(FragmentManager.java:373)
at androidx.fragment.app.K.c(FragmentManager.java:38)
at androidx.fragment.app.K.c(FragmentManager.java:22)
at androidx.fragment.app.K.b(FragmentManager.java:49)
at androidx.fragment.app.K.c(FragmentManager.java:42)
at androidx.fragment.app.k.e(Fragment.java:6)
at androidx.fragment.app.T.a(FragmentStateManager.java:56)
at androidx.fragment.app.K.a(FragmentManager.java:177)
at androidx.fragment.app.K.h(FragmentManager.java:4)
at androidx.fragment.app.K.a(FragmentManager.java:257)
at androidx.fragment.app.K.b(FragmentManager.java:47)
at androidx.fragment.app.K.c(FragmentManager.java:42)
at androidx.fragment.app.w.a(FragmentController.java:9)
at androidx.fragment.app.m.onStart(FragmentActivity.java:5)
at androidx.appcompat.app.v.onStart(AppCompatActivity.java:1)
at android.app.Instrumentation.callActivityOnStart(Instrumentation.java:1392)
at android.app.Activity.performStart(Activity.java:7157)
at android.app.ActivityThread.handleStartActivity(ActivityThread.java:2952)
at android.app.servertransaction.TransactionExecutor.performLifecycleSequence(TransactionExecutor.java:180)
at android.app.servertransaction.TransactionExecutor.cycleToPath(TransactionExecutor.java:165)
at android.app.servertransaction.TransactionExecutor.executeLifecycleState(TransactionExecutor.java:142)
at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:70)
at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1823)
at android.os.Handler.dispatchMessage(Handler.java:107)
at android.os.Looper.loop(Looper.java:198)
at android.app.ActivityThread.main(ActivityThread.java:6729)
at java.lang.reflect.Method.invoke(Native Method)
at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:493)
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:858)
Caused by: java.lang.NoSuchMethodException: <init> [class android.app.Application]
at java.lang.Class.getConstructor0(Class.java:2327)
at java.lang.Class.getConstructor(Class.java:1725)
at androidx.lifecycle.M.a(ViewModelProvider.java:5)
at androidx.lifecycle.I.a(SavedStateViewModelFactory.java:4)
at androidx.lifecycle.Q.a(ViewModelProvider.java:8)
at com.myapp.screenrecorder.taskmedia.video.b.invoke(com.android.tools.r8.jetbrains.kotlin-style lambda group:1)
at kotlin.l.getValue(Lazy.kt:2)
at com.myapp.screenrecorder.taskmedia.video.VideoFragment.e(VideoFragment.kt:1)
at com.myapp.screenrecorder.taskmedia.video.g.c(VideoFragment.kt:11)
at kotlin.coroutines.jvm.internal.a.a(ContinuationImpl.kt:3)
at kotlinx.coroutines.K.a(Dispatched.kt:18)
at com.myapp.simplefilechooser.g.a(Unknown Source:20)
at kotlinx.coroutines.a.a(AbstractCoroutine.kt:21)
at kotlinx.coroutines.d.a(Unknown Source:16)
at com.myapp.screenrecorder.taskmedia.video.VideoFragment.d0(VideoFragment.kt:1)
at com.myapp.screenrecorder.taskmedia.video.VideoFragment.a(VideoFragment.kt:18)
at androidx.fragment.app.T.a(FragmentStateManager.java:51)
at androidx.fragment.app.K.a(FragmentManager.java:176)
at androidx.fragment.app.K.a(FragmentManager.java:426)
at androidx.fragment.app.K.a(FragmentManager.java:373)
at androidx.fragment.app.K.c(FragmentManager.java:38)
at androidx.fragment.app.K.c(FragmentManager.java:22)
at androidx.fragment.app.K.b(FragmentManager.java:49)
at androidx.fragment.app.K.c(FragmentManager.java:42)
at androidx.fragment.app.k.e(Fragment.java:6)
at androidx.fragment.app.T.a(FragmentStateManager.java:56)
at androidx.fragment.app.K.a(FragmentManager.java:177)
at androidx.fragment.app.K.h(FragmentManager.java:4)
at androidx.fragment.app.K.a(FragmentManager.java:257)
at androidx.fragment.app.K.b(FragmentManager.java:47)
at androidx.fragment.app.K.c(FragmentManager.java:42)
at androidx.fragment.app.w.a(FragmentController.java:9)
at androidx.fragment.app.m.onStart(FragmentActivity.java:5)
at androidx.appcompat.app.v.onStart(AppCompatActivity.java:1)
at android.app.Instrumentation.callActivityOnStart(Instrumentation.java:1392)
at android.app.Activity.performStart(Activity.java:7157)
at android.app.ActivityThread.handleStartActivity(ActivityThread.java:2952)
at android.app.servertransaction.TransactionExecutor.performLifecycleSequence(TransactionExecutor.java:180)
at android.app.servertransaction.TransactionExecutor.cycleToPath(TransactionExecutor.java:165)
at android.app.servertransaction.TransactionExecutor.executeLifecycleState(TransactionExecutor.java:142)
at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:70)
at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1823)
at android.os.Handler.dispatchMessage(Handler.java:107)
at android.os.Looper.loop(Looper.java:198)
at android.app.ActivityThread.main(ActivityThread.java:6729)
at java.lang.reflect.Method.invoke(Native Method)
at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:493)
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:858)
sc...@gmail.com <sc...@gmail.com> #5
sc...@gmail.com <sc...@gmail.com> #6
The finally file size is 4,179KB. I don't know why before file size is 3804KB, maybe the cause is the part missing of proguard.
Thank you!
fu...@google.com <fu...@google.com> #7
As jsjeon@google.com mentioned in
-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.AndroidViewModel {
<init>(android.app.Application);
}
should come from the aar, but it does not show up in your -printconfiguration output, which seems strange.
To test I created a "Basic Activity" app, and added
dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-rc02"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0-rc02"
implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0-rc02"
}
and when I add -printconfiguration the rule above is in the file - you should see that as well.
It would be interesting to understand why this does not work. I am not that familiar with androidx.lifecycle, but I don't think you should need the rule '-keep class **VideoModel'. I wonder if you could try the following without that rule:
1. Add the rule '-whyareyoukeeping class **VideoModel' and build release. The output from -whyareyoukeeping goes to stdout for the build.
2. Look at the mapping file app/build/outputs/mapping/release/mapping.txt for the build from 1), and look for you ViewModel class.
3. If the above still crash at runtime try the rule '-keep,allowobfuscation class **VideoModel'
4. Look at the mapping file app/build/outputs/mapping/release/mapping.txt for the build from 3), and look for you ViewModel class.
sc...@gmail.com <sc...@gmail.com> #8
I build all cases with AGP 3.6.0-beta04 and this the result:
-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.AndroidViewModel {
<init>(android.app.Application);
}
or '-whyareyoukeeping class **VideoModel
But it still crashed at runtime because it missed this in the mapping.txt
android.app.Application app -> c
1:1:void <init>(android.app.Application):17:17 -> <init>
.........................................................
When adding rule '-keep,allowobfuscation class **VideoModel'. It worked fine because it added full.
fu...@google.com <fu...@google.com> #9
So, again, from
> 1. Add the rule '-whyareyoukeeping class **VideoModel' and build release. The output from -whyareyoukeeping goes to stdout for the build.
This actually meant, building with AGP 3.5.2, not AGP 3.6.0-beta04 (because we knew beta version is not keeping something on that hierarchy).
> 3. If the above still crash at runtime try the rule '-keep,allowobfuscation class **VideoModel'
But, this one meant AGP 3.6.0-beta04, in order to see if renaming matters v.s. it's literally missing to trace fundamental components. And, that's what you already tested, thanks.
------
But... you can hold on doing another build and experiment, since I feel like we're chasing a wrong target. The reason we kept asking you to chase why your **.ViewModel was kept or not was, mainly because that seems like the one we're missing according to
E/TAG: java.lang.RuntimeException: Cannot create an instance of class com.myapp.screenrecorder.taskmedia.video.s
at androidx.lifecycle.M.a(ViewModelProvider.java:9)
at androidx.lifecycle.I.a(SavedStateViewModelFactory.java:4)
at androidx.lifecycle.Q.a(ViewModelProvider.java:8)
and the other is:
Caused by: java.lang.NoSuchMethodException: <init> [class android.app.Application]
at java.lang.Class.getConstructor0(Class.java:2327)
at java.lang.Class.getConstructor(Class.java:1725)
at androidx.lifecycle.M.a(ViewModelProvider.java:5)
Indeed, there are many reflective instance creations in ViewModelProvider, e.g.,
------
More interestingly, according to
which I believe came from:
Not seeing `-dontoptimize` at 3.6.0-beta04.txt means it's using
Maybe that came from other dependent libraries. Then, I guess the issue was just hidden even with AGP 3.5.2
------
According to
class MyActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
// Create a ViewModel the first time the system calls an activity's onCreate() method.
// Re-created activities receive the same MyViewModel instance created by the first activity.
val model = ViewModelProviders.of(this)[MyViewModel::class.java]
model.getUsers().observe(this, Observer<List<User>>{ users ->
// update UI
})
}
}
and there, type reference, e.g., MyViewModel::class.java, made that type being kept, and then trigger -keepclassmembers rules with <init>. That's how ViewModelProvider can reflectively instantiate users' view model. Could you let us know how your **.VideoModel is used?
sc...@gmail.com <sc...@gmail.com> #10
ViewModelProviders.of is deprecated so I am using
class VideoFragment : Fragment() {
private val videoModel: VideoModel by lazy(LazyThreadSafetyMode.NONE) {
ViewModelProvider(this).get(VideoModel::class.java)
}
............................
private fun loadVideos() {
val videos = videoModel.getVideos()
}
}
class VideoModel(val app: Application) : AndroidViewModel(app) {
suspend fun getVideos(): List<MediaItem> = withContext(ioDispatcher) {
val appSettings = AppSettings.getInstance(app)
if (appSettings.locationStorageType == 0) {
traverseInternalStorage(appSettings.videoDirectory)
} else {
traverseRemovableStorage(appSettings.externalStorageUri?.toUri())
}
}
..................
}
My config in build.gradle
buildTypes {
release {
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
manifestPlaceholders += [crashlyticsEnabled: true]
}
}
gradle.properties
org.gradle.parallel=true
org.gradle.caching=true
android.enableJetifier=true
android.useAndroidX=true
android.enableR8.fullMode=true
android.debug.obsoleteApi=true
kapt.incremental.apt=true
Now my proguard-rules.pro config
-keep public class * implements com.bumptech.glide.module.GlideModule
-keep public class * extends com.bumptech.glide.AppGlideModule
-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
**[] $VALUES;
public *;
}
-keep class com.coremedia.iso.** { *; }
-keep class com.googlecode.mp4parser.** { *; }
-keep class com.mp4parser.** { *; }
-keep class org.mp4parser.aspectj.internal.** { *; }
-keep class org.mp4parser.aspectj.lang.** { *; }
-keep class org.mp4parser.aspectj.runtime.** { *; }
-dontwarn com.googlecode.mp4parser.authoring.tracks.mjpeg.OneJpegPerIframe
# For Kotlin coroutines
# ServiceLoader support
-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
-keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}
-keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}
# Most of volatile fields are updated with AFU and should not be mangled
-keepclassmembernames class kotlinx.** {
volatile <fields>;
}
#
-keep @interface kotlin.coroutines.jvm.internal.** { *; }
# In-app
-keep class com.android.vending.billing.**
-keepattributes *Annotation*
-keepattributes SourceFile,LineNumberTable
-keep public class * extends java.lang.Exception
# Avoid runtime app crash
-keep,allowobfuscation **VideoModel
AGP 3.5.2 I didn't added any rule for VideoModel it worked fine.
AGP 3.6.0-beta04 I need to add rule -keep,allowobfuscation **VideoModel to the app doesn't error at runtime.
I have another project it using the AndroidViewModel and same code but when build with AGP 3.6.0-beta04, it worked as AGP 3.5.2 (didn't need to add a proguard rule for ViewModel).
I think it had a problem for my project. Because this didn't happen on all project.
Thank for your supporting!
sc...@gmail.com <sc...@gmail.com> #11
sm...@gmail.com <sm...@gmail.com> #12
Thanks!
tr...@google.com <tr...@google.com> #13
Please take a look at the other issue marked as a dup and try R8 2.0.39 as mentioned at
sm...@gmail.com <sm...@gmail.com> #14
The aspect ratio should be 16:9 as this preview is nearly full screen (Ie
image under status bar, but not the navbar). The only other possibility is
4:3 but I don't know many phones that will resolve that ratio. I'm using
the value from AspectRatio. Both use cases use the same aspect ratio value.
The only other value I set in the use cases is the targetRotation.
Note: this is not consistent. However our QA tester did happen to be screen
recording it so it is clear that it is during the initialization phase of
the camera.
On Mon, Jul 20, 2020 at 9:57 PM <buganizer-system@google.com> wrote:
sm...@gmail.com <sm...@gmail.com> #15
implementation "androidx.camera:camera-camera2:1.0.0-beta07"
implementation "androidx.camera:camera-lifecycle:1.0.0-beta07"
implementation "androidx.camera:camera-view:1.0.0-alpha14"
I added some logging related to this ticket:
cd...@gmail.com <cd...@gmail.com> #16
As you can see, the preview is green tinted and flipped.
CameraX Version:
implementation "androidx.camera:camera-camera2:1.0.0-beta07"
implementation "androidx.camera:camera-lifecycle:1.0.0-beta07"
implementation "androidx.camera:camera-view:1.0.0-alpha14"
Device:
[LG Verizon Tablet VK700] (
===========
NB: This problem was also shared in another issue: (
cd...@gmail.com <cd...@gmail.com> #17
sc...@gmail.com <sc...@gmail.com> #18
I've recorded a video of it happening and attached. How can we triage this issue further to assist fixing it?
sc...@gmail.com <sc...@gmail.com> #19
tr...@google.com <tr...@google.com> #20
Thanks I'll give this a shot on the Galaxy S7. So far I have only been able to reproduce this issue once on the Galaxy S7 and never again, so if this method can reproduce the issue that should be sufficient to track down what's going on.
To double check with the original reporter, have you been able to reproduce this issue on any other device besides the Galaxy S7?
sc...@gmail.com <sc...@gmail.com> #21
sc...@gmail.com <sc...@gmail.com> #22
#20, Have you been able to reproduce it?
ap...@google.com <ap...@google.com> #23
Branch: androidx-master-dev
commit d28fa62279c51229945faf83faa421510e59a813
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 00:21:38 2020
Add CameraInfoInternal to UseCase#mergeConfigs()
This allows the CameraInfo to be used by the UseCase's onMergeConfig()
to make determinations about conflict resolutions.
This will be used to check for the existance of a quirk in ImageCapture
which will use a software encoding pipeline to create JPEGs.
Bug: 159831206
Test: UseCaseTest
Change-Id: I3bcf8b72a959b3d37364217a921c06b99776fe69
M camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2DeviceSurfaceManagerTest.java
M camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.java
M camera/camera-core/src/androidTest/java/androidx/camera/core/UseCaseTest.java
M camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
M camera/camera-core/src/main/java/androidx/camera/core/Preview.java
M camera/camera-core/src/main/java/androidx/camera/core/UseCase.java
M camera/camera-core/src/main/java/androidx/camera/core/internal/CameraUseCaseAdapter.java
M camera/camera-testing/src/main/java/androidx/camera/testing/Configs.java
ap...@google.com <ap...@google.com> #24
Branch: androidx-master-dev
commit 11ef032d526d35e0b53e8dc7697c9d862616ecde
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 00:46:49 2020
Quirks#contains() for checking existence of quirks
Adds a contains() method to the Quirks class which checks for the
existance of a quirk in the Quirks container.
This will also allow checking for the existance of a quirk by its
superclass or superinterface, as long as the superclass or
superinterface is a quirk itself.
Bug: 159831206
Test: QuirksTest
Change-Id: I41fd9955916897a7af0438a0cc1c2f72df387c4a
M camera/camera-core/src/main/java/androidx/camera/core/impl/Quirks.java
M camera/camera-core/src/test/java/androidx/camera/core/impl/QuirksTest.java
ap...@google.com <ap...@google.com> #25
Branch: androidx-master-dev
commit 9e2c61d9df3d8962a133f386f0dbce97f95f3ff8
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 01:53:26 2020
Move CameraQuirks from Camera to CameraInfo
This allows quirks to be retrieved from CameraInfoInternal.
Since CameraInfoInternal is retrievable from CameraInternal, it can
still be retrieved from CameraInternal
Bug: 159831206
Test: N/A, simple move
Change-Id: Ib4457d14b0dbde26fcf7d4fd09df21624d7e9113
M camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInfoAdapter.kt
M camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInternalAdapter.kt
M camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraImpl.java
M camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraInfoImpl.java
M camera/camera-core/src/main/java/androidx/camera/core/impl/CameraInfoInternal.java
M camera/camera-core/src/main/java/androidx/camera/core/impl/CameraInternal.java
M camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCamera.java
M camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraInfoInternal.java
ap...@google.com <ap...@google.com> #26
Branch: androidx-master-dev
commit e2b6eece39593fc1952838048ba5e7349e48081f
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 00:28:41 2020
Utility in-memory EXIF writer class
Introduces ExifData and ExifOutputStream classes which are adapted from
ExifInterface in order to write EXIF in-memory. This was not possible
with ExifInterface as it requires a File or FileDescriptor to modify
EXIF values.
These new classes only support writing a subset of EXIF tags from
ExifInterface. Some other functionality removed includes writing
thumbnails/strips, support for XMP, and support for other formats
besides JPEG.
ExifOutputStream wraps another output stream to write ExifData directly
into the JPEG data. It is suitable as an output for
YuvImage.compressToJpeg() and Bitmap.compress().
This will be used by ImageCapture to write EXIF when encoding JPEGs
using a software JPEG encoder, but may be expanded/adapted later to
replace less efficient uses of ExifInterface which make use of temp
files.
Bug: 159831206
Test: ExifDataTest, ExifOutputStreamTest
Change-Id: Ided3d716348fa4871940524df40d35a93823ca1a
M camera/camera-core/build.gradle
A camera/camera-core/src/androidTest/java/androidx/camera/core/impl/utils/ExifOutputStreamTest.kt
A camera/camera-core/src/main/java/androidx/camera/core/impl/utils/ByteOrderedDataInputStream.java
A camera/camera-core/src/main/java/androidx/camera/core/impl/utils/ByteOrderedDataOutputStream.java
A camera/camera-core/src/main/java/androidx/camera/core/impl/utils/ExifAttribute.java
A camera/camera-core/src/main/java/androidx/camera/core/impl/utils/ExifData.java
A camera/camera-core/src/main/java/androidx/camera/core/impl/utils/ExifOutputStream.java
A camera/camera-core/src/main/java/androidx/camera/core/impl/utils/ExifTag.java
A camera/camera-core/src/main/java/androidx/camera/core/impl/utils/LongRational.java
A camera/camera-core/src/test/java/androidx/camera/core/impl/utils/ExifDataTest.kt
ap...@google.com <ap...@google.com> #27
Branch: androidx-master-dev
commit 1cc6a3d965b303a58dd1ebe99842c352afe8b34f
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 00:36:00 2020
ImageWriterCompat for specifying format
Adds ImageWriterCompat class which can be used to create an ImageWriter
with the ability to specify the format on API 26+. This functionality
could previously only be accessed on API 29.
This allows using an ImageWriter to write JPEGs to a JPEG ImageReader.
Bug: 159831206
Test: ImageWriterCompatTest
Change-Id: I02c4f6a3a5ceebe66e16e65b0abc526eef2bbd94
A camera/camera-core/src/main/java/androidx/camera/core/internal/compat/ImageWriterCompat.java
A camera/camera-core/src/main/java/androidx/camera/core/internal/compat/ImageWriterCompatApi26Impl.java
A camera/camera-core/src/main/java/androidx/camera/core/internal/compat/ImageWriterCompatApi29Impl.java
A camera/camera-core/src/main/java/androidx/camera/core/internal/compat/package-info.java
A camera/camera-core/src/test/java/androidx/camera/core/internal/compat/ImageWriterCompatTest.java
ap...@google.com <ap...@google.com> #28
Branch: androidx-master-dev
commit 3db0961cf57164c28f710934c8f86059a83b2d21
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 01:18:55 2020
Extract ExifData from ImageInfo
Adds ability to retrieve exif information from ImageInfo and put it
into an ExifData.Builder.
This will be used to generate software encoded JPEGs in ImageCapture
Bug: 159831206
Test: ./gradlew connectedCheck on 'heroqltevzw' (device affected by bug)
Change-Id: I8401816812103701260675c5aaa28b5b6c34722a
M camera/camera-camera2/build.gradle
M camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraCaptureResultTest.java
M camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraCaptureResult.java
M camera/camera-core/src/main/java/androidx/camera/core/ImageInfo.java
M camera/camera-core/src/main/java/androidx/camera/core/ImmutableImageInfo.java
M camera/camera-core/src/main/java/androidx/camera/core/impl/CameraCaptureResult.java
M camera/camera-core/src/main/java/androidx/camera/core/internal/CameraCaptureResultImageInfo.java
M camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeImageInfo.java
ap...@google.com <ap...@google.com> #29
Branch: androidx-master-dev
commit 8e6500ea49a0c8b0ee9061c3f169326367308f2e
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 12:57:11 2020
Add output ImageFormat to ProcessingImageReader
Allows ProcessingImageReader to have differring input and output
formats.
This allows ProcessingImageReader to do image format conversion, such
as converting YUV to JPEG or RGB.
Bug: 159831206
Test: ./gradlew camera:camera-core:connectedCheck
Change-Id: Ib93c2727e1935cac324492578fb984a2e1a15769
M camera/camera-core/src/main/java/androidx/camera/core/ProcessingImageReader.java
M camera/camera-core/src/test/java/androidx/camera/core/ProcessingImageReaderTest.java
ap...@google.com <ap...@google.com> #30
Branch: androidx-master-dev
commit 6aa34a2b3faad8227b3311a8e372e4ccf7eaf462
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 23:32:41 2020
Add JpegHalCorruptImageQuirk and superinterface
Adds device quirk to workaround issue where HAL sometimes produces
corrupt JPEGs on SM-G930V back camera.
This is accomplished by adding a quirk interface called
SoftwareJpegEncodingPreferredQuirk, which is defined in camera-core and
can be subclassed in the camera implementation library.
JpegHalCorruptImageQuirk subclasses SoftwareJpegEncodingPreferredQuirk
in camera-camera2.
JpegHalCorruptImageQuirk is added to the CameraQuirks, and the
existence of the superinterface is checked in ImageCapture to
automatically enable software JPEG encoding on the device.
Relnote: "Workaround included for intermittent corrupt image data in
JPEGs on SM-G930V back-facing camera."
Bug: 159831206
Test: Manual reproduction steps on local SM-G930V no longer produce
issue.
Change-Id: I5aca54ce3ce8a5a50bc7b84175b2f0dbb7e706e2
M camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/quirk/CameraQuirks.java
A camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/quirk/JpegHalCorruptImageQuirk.java
M camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
A camera/camera-core/src/main/java/androidx/camera/core/internal/compat/quirk/SoftwareJpegEncodingPreferredQuirk.java
ap...@google.com <ap...@google.com> #31
Branch: androidx-master-dev
commit 4be48010e316fe42a0acab3055f5ef4d93f5f4cf
Author: Trevor McGuire <trevormcguire@google.com>
Date: Mon Dec 07 22:46:56 2020
Software JPEG pipeline in ImageCapture
Adds a software JPEG pipeline to ImageCapture which can be used instead
of receiving JPEGs directly from the HAL. This can be used in
compatibility cases where problems may exist with JPEGs from the HAL
such as corrupted images. This could also be used in cases where
encoding JPEGs in software may be faster than using a HW JPEG encoder.
This pipeline will produce android.media.Image with type JPEG, but can
only be used on API 26+.
This feature can be enabled by using the hidden ImageCapture.Builder
option setSoftwareJpegEncoderRequested().
Bug: 159831206
Test: ./gradlew camera:camera-camera2:connectedCheck
Change-Id: I253fc0ffa285c3cd60681d396b68e08286dc6c95
M camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
M camera/camera-core/src/main/java/androidx/camera/core/ProcessingImageReader.java
M camera/camera-core/src/main/java/androidx/camera/core/impl/ImageCaptureConfig.java
A camera/camera-core/src/main/java/androidx/camera/core/internal/YuvToJpegProcessor.java
M camera/camera-core/src/main/java/androidx/camera/core/internal/utils/ImageUtil.java
M camera/camera-testing/src/main/java/androidx/camera/testing/CameraUtil.java
sc...@gmail.com <sc...@gmail.com> #32
tr...@google.com <tr...@google.com> #33
This will be part of our mid-month December release next week.
Just a note on this bug for later reference:
The bug isn't exclusive to CameraX, but can be reproduced with Camera2. I've attached a version of Camera2Basic
(CameraXBasic
. The bug can be reliably reproduced with the following steps on an SM-G930V:
- Install attached
Camera2Basic
and (optionally) add to the home screen so it can be easily opened. - Restart the phone.
- Immediately launch
Camera2Basic
as soon as the phone starts. - As soon as the preview is displayed, rapidly press the shutter button for ~30 shots.
- Wait for all shots to finish (thumbnails should stop updating), you may see some green thumbnails while capturing.
- View the shots that were taken in the phone's gallery app. Some of the shots near the beginning of the burst of captures may exhibit the bug. If not, repeat all steps.
ap...@google.com <ap...@google.com> #34
Branch: androidx-main
commit 8768eb76402e8c3f4bed01d6c39a9548e7575726
Author: leo huang <leohuang@google.com>
Date: Sat Jan 09 06:26:06 2021
Add SM-G930T to JpegHalCorruptImageQuirk
The green image issue can also be observed on SM-G930T back camera.
Relnote: "Workaround included for intermittent corrupt image data in JPEGs on SM-G930T back-facing camera."
Bug: 159831206
Test: Manual test
Change-Id: I52001b98b8124fc9a3ee6b8c343225bb21881d12
M camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/quirk/JpegHalCorruptImageQuirk.java
er...@google.com <er...@google.com> #35
Closing this out. Thanks!
ap...@google.com <ap...@google.com> #36
Branch: androidx-main
commit a7c4eab91156e6d1e54a81c5cebdeb37348a1abe
Author: Tahsin Masrur <tahsinm@google.com>
Date: Wed Mar 01 15:24:57 2023
[CameraPipe] Add JpegHalCorruptImageQuirk
Quirk to workaround issue where HAL sometimes produces corrupt JPEGs. Ref:
Bug: 267558909
Test: JpegHalCorruptImageQuirkTest
Change-Id: I2f0c62d8db76306a689f4576fd5c5ef6c8573f02
M camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/compat/quirk/CameraQuirks.kt
A camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/compat/quirk/JpegHalCorruptImageQuirk.kt
A camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/compat/quirk/JpegHalCorruptImageQuirkTest.kt
Description
androidx.camera:camera-camera2:1.0.0-beta05
androidx.camera:camera-lifecycle:1.0.0-beta05
androidx.camera:camera-view:1.0.0-alpha12
CAMERA APPLICATION NAME AND VERSION: (Settings > Apps > (app name) > version)
1.0
ANDROID OS BUILD NUMBER: (Settings > About > Build number)
R16NW.G930VVRU8CRJ3
DEVICE NAME: (Nexus 5X, Samsung S6, etc)
Samsung Galaxy S7 (SM-G930V)
DESCRIPTION:
For some camera sessions CameraX will produce completely green images. In those sessions I see 20-30% of photos taken being completely green. In other sessions I see no issues.
LIST ANY EXPERIMENTAL FEATURES: (As an example - @ExperimentalCamera2Interop)
Unaware of any.
STEPS TO REPRODUCE:
1. Take photos in rapid succession
2. Save photos to media store
3. View photos
OBSERVED RESULTS:
Some photos appear completely green, others appear normal.
EXPECTED RESULTS:
All photos should appear normal
REPRODUCIBILITY: (5 of 5, 1 of 100, etc)
10 of 100
ADDITIONAL INFORMATION:
This issue is critical to my team, as users can't immediately review all photos and when taking several photos they may easily miss the green photos. This leads to critical loss of data.
I've attached a logcat grab for a session with 7 photos, 2 of which turned out green.
Please ignore the ADB logcat error "camera is closed" at the end of the capture, as I closed the camera too quick while it was still processing. I believe this is my own fault.
CODE FRAGMENTS (this will help us troubleshoot your issues):
// capture code - outputPath is null in all tests, which leads to saving to MediaStore:
// Create output options object which contains file + metadata
val contentValues = ContentValues().apply {
put(MediaStore.MediaColumns.DISPLAY_NAME, "Untitled")
put(MediaStore.MediaColumns.MIME_TYPE, "image/jpg")
}
// Create the output file option to store the captured image in MediaStore
val outputOptions = when (outputPath) {
null -> ImageCapture.OutputFileOptions
.Builder(
context.contentResolver,
MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
contentValues
)
.build()
else -> ImageCapture.OutputFileOptions
.Builder(File(outputPath))
.build()
}
flashViewFinder()
val audio = getActivity().getSystemService(Context.AUDIO_SERVICE) as AudioManager
if (audio.ringerMode == AudioManager.RINGER_MODE_NORMAL) {
MediaActionSound().play(MediaActionSound.SHUTTER_CLICK);
}
// Setup image capture listener which is triggered after photo has
// been taken
imageCapture?.takePicture(
outputOptions, ContextCompat.getMainExecutor(getActivity()), object : ImageCapture.OnImageSavedCallback {
override fun onError(ex: ImageCaptureException) {
Log.e(TAG, "CameraView: Photo capture failed: ${ex.message}", ex)
promise.reject("E_CAPTURE_FAILED", "takePicture failed: ${ex.message}")
}
override fun onImageSaved(output: ImageCapture.OutputFileResults) {
try {
val savedUri = output.savedUri.toString()
onPictureTaken(savedUri)
Log.d(TAG, "CameraView: Photo capture succeeded: $savedUri")
val imageInfo = Arguments.createMap()
imageInfo.putString("uri", savedUri)
imageInfo.putString("id", output.savedUri?.path)
imageInfo.putString("name", output.savedUri?.lastPathSegment)
// imageInfo.putInt("size", null)
imageInfo.putInt("width", width)
imageInfo.putInt("height", height)
imageInfo.putString("path", output.savedUri?.path)
promise.resolve(imageInfo)
} catch(ex: Exception) {
Log.e(TAG, "Error while saving or decoding saved photo: ${ex.message}", ex)
promise.reject("E_ON_IMG_SAVED", "Error while reading saved photo: ${ex.message}")
}
}
})