aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/persistance/FileBackend.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-12-14 22:03:33 +0100
committerChristian Schneppe <christian@pix-art.de>2018-12-14 22:04:42 +0100
commit155332f65b5fc5baaaff845f2c288056d7ae12ec (patch)
treef2d55cb9fe796c6dee67c02355706ddc7738df1f /src/main/java/de/pixart/messenger/persistance/FileBackend.java
parent7df333bf2a8aad44f082ac6a6a9ee49948ce36d7 (diff)
limit video transcoding to api >= 18 and other api 16 fixes
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/persistance/FileBackend.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index ddc0e6ee8..5efadd3ff 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -21,6 +21,7 @@ import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.provider.MediaStore;
import android.provider.OpenableColumns;
+import android.support.annotation.RequiresApi;
import android.support.v4.content.FileProvider;
import android.system.Os;
import android.system.StructStat;
@@ -1158,7 +1159,12 @@ public class FileBackend {
if (dimensions != null) {
return dimensions;
}
- int rotation = extractRotationFromMediaRetriever(metadataRetriever);
+ final int rotation;
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
+ rotation = extractRotationFromMediaRetriever(metadataRetriever);
+ } else {
+ rotation = 0;
+ }
boolean rotated = rotation == 90 || rotation == 270;
int height;
try {
@@ -1179,6 +1185,7 @@ public class FileBackend {
return rotated ? new Dimensions(width, height) : new Dimensions(height, width);
}
+ @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
private static int extractRotationFromMediaRetriever(MediaMetadataRetriever metadataRetriever) {
String r = metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION);
try {