mirror/opencamera
0
0
Fork 0
mirror of https://git.code.sf.net/p/opencamera/code.git synced 2024-09-20 03:52:26 +02:00
Code

Use loadThumbnailFromUri() to reduce codepaths and fix bugs.

Browse Source
This commit is contained in:
Mark Harman 2024-02-17 20:01:00 +00:00
parent 0be46d72f1
commit 3f25cdf408
2 changed files with 45 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_docs/history.html
View File

@ -56,6 +56,8 @@ FIXED If force destroyed when in settings, the camera would be incorrectly ope
was recreated (camera should only be reopened when leaving settings).
ADDED Camera vendor extensions show percentage progress on supported Android 14 devices.
ADDED Long press on switch camera icons now bring up a menu to jump to any camera.
UPDATED Improvements for loading thumbnails for gallery icon (including fixing orientation for
X-NIGHT portrait images on Pixel 6 Pro).
UPDATED Improvements for popup menu and exposure UI when using large font sizes.
UPDATED Made user's font size preference apply to on-screen text.
UPDATED Changes in preparation for back button behaviour for future Android versions.

62
app/src/main/java/net/sourceforge/opencamera/MainActivity.java
View File

@ -4136,9 +4136,12 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
* MediaStore uris, as well as allowing control over the resolution of the thumbnail.
* If sample_factor is 1, this returns a bitmap scaled to match the display resolution. If
* sample_factor is greater than 1, it will be scaled down to a lower resolution.
* @param exif_rotate Whether the rotate the bitmap due to exif orientation.
* We now use this for photos in preference to APIs like
* MediaStore.Images.Thumbnails.getThumbnail(). Advantages are simplifying the code, reducing
* number of different codepaths, but also seems to help against device specific bugs
* in getThumbnail() e.g. Pixel 6 Pro with x-night in portrait.
*/
private Bitmap loadThumbnailFromUri(Uri uri, int sample_factor, boolean exif_rotate) {
private Bitmap loadThumbnailFromUri(Uri uri, int sample_factor) {
Bitmap thumbnail = null;
try {
//thumbnail = MediaStore.Images.Media.getBitmap(getContentResolver(), media.uri);
@ -4195,10 +4198,8 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
}
is.close();
if( exif_rotate ) {
thumbnail = rotateForExif(thumbnail, uri);
}
}
catch(IOException e) {
Log.e(TAG, "failed to load bitmap for ghost image last");
e.printStackTrace();
@ -4278,7 +4279,6 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
Log.d(TAG, "doInBackground");
StorageUtils.Media media = applicationInterface.getStorageUtils().getLatestMedia();
Bitmap thumbnail = null;
boolean rotate_for_orientation = true; // whether we should apply the media.orientation rotation
KeyguardManager keyguard_manager = (KeyguardManager)MainActivity.this.getSystemService(Context.KEYGUARD_SERVICE);
boolean is_locked = keyguard_manager != null && keyguard_manager.inKeyguardRestrictedInputMode();
if( MyDebug.LOG )
@ -4293,13 +4293,20 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
if( ghost_image_last && !media.video ) {
if( MyDebug.LOG )
Log.d(TAG, "load full size bitmap for ghost image last photo");
// if media.mediastore, we'll rotate below using the media.orientation
thumbnail = loadThumbnailFromUri(media.uri, 1, !media.mediastore);
// use sample factor of 1 so that it's full size for ghost image
thumbnail = loadThumbnailFromUri(media.uri, 1);
}
if( thumbnail == null ) {
try {
if( !media.mediastore ) {
if( media.video ) {
if( !media.video ) {
if( MyDebug.LOG )
Log.d(TAG, "load thumbnail for photo");
// use sample factor as this image is only used for thumbnail; and
// unlike code in MyApplicationInterface.saveImage() we don't need to
// worry about the thumbnail animation when taking/saving a photo
thumbnail = loadThumbnailFromUri(media.uri, 8);
}
else if( !media.mediastore ) {
if( MyDebug.LOG )
Log.d(TAG, "load thumbnail for video from SAF uri");
ParcelFileDescriptor pfd_saf = null; // keep a reference to this as long as retriever, to avoid risk of pfd_saf being garbage collected
@ -4331,25 +4338,10 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
}
}
else {
if( MyDebug.LOG )
Log.d(TAG, "load thumbnail for photo from SAF uri");
thumbnail = loadThumbnailFromUri(media.uri, 4, true);
}
}
else if( media.video ) {
if( MyDebug.LOG )
Log.d(TAG, "load thumbnail for video");
thumbnail = MediaStore.Video.Thumbnails.getThumbnail(getContentResolver(), media.id, MediaStore.Video.Thumbnails.MINI_KIND, null);
}
else {
if( MyDebug.LOG )
Log.d(TAG, "load thumbnail for photo");
thumbnail = MediaStore.Images.Thumbnails.getThumbnail(getContentResolver(), media.id, MediaStore.Images.Thumbnails.MINI_KIND, null);
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
// MediaStore.Images.Thumbnails.getThumbnail() is documented that as of Android Q, we no longer need to apply the orientation
rotate_for_orientation = false;
}
}
}
catch(Throwable exception) {
// have had Google Play NoClassDefFoundError crashes from getThumbnail() for Galaxy Ace4 (vivalto3g), Galaxy S Duos3 (vivalto3gvn)
@ -4359,28 +4351,6 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
exception.printStackTrace();
}
}
if( thumbnail != null && rotate_for_orientation ) {
if( MyDebug.LOG )
Log.d(TAG, "thumbnail orientation is " + media.orientation);
if( media.orientation != 0 ) {
if( MyDebug.LOG )
Log.d(TAG, "thumbnail size is " + thumbnail.getWidth() + " x " + thumbnail.getHeight());
Matrix matrix = new Matrix();
matrix.setRotate(media.orientation, thumbnail.getWidth() * 0.5f, thumbnail.getHeight() * 0.5f);
try {
Bitmap rotated_thumbnail = Bitmap.createBitmap(thumbnail, 0, 0, thumbnail.getWidth(), thumbnail.getHeight(), matrix, true);
// careful, as rotated_thumbnail is sometimes not a copy!
if( rotated_thumbnail != thumbnail ) {
thumbnail.recycle();
thumbnail = rotated_thumbnail;
}
}
catch(Throwable t) {
if( MyDebug.LOG )
Log.d(TAG, "failed to rotate thumbnail");
}
}
}
}
//return thumbnail;