narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

ignore http upload file size constraints for videos that will be compressed

Browse source
This commit is contained in:
Daniel Gultsch 2017-09-18 22:42:25 +02:00
parent 66dd4dc654
commit 4e864935fe
2 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -152,6 +152,18 @@ public class FileBackend {
return true; //exception to be compatible with HTTP Upload < v0.2 return true; //exception to be compatible with HTTP Upload < v0.2
} }
for(Uri uri : uris) { for(Uri uri : uris) {
String mime = context.getContentResolver().getType(uri);
if (mime != null && mime.startsWith("video/")) {
try {
Dimensions dimensions = FileBackend.getVideoDimensions(context,uri);
if (dimensions.getMin() > 720) {
Log.d(Config.LOGTAG,"do not consider video file with min width larger than 720 for size check");
continue;
}
} catch (NotAVideoFile notAVideoFile) {
//ignore and fall through
}
}
if (FileBackend.getFileSize(context, uri) > max) { if (FileBackend.getFileSize(context, uri) > max) {
Log.d(Config.LOGTAG,"not all files are under "+max+" bytes. suggesting falling back to jingle"); Log.d(Config.LOGTAG,"not all files are under "+max+" bytes. suggesting falling back to jingle");
return false; return false;
@ -815,6 +827,16 @@ public class FileBackend {
} catch (Exception e) { } catch (Exception e) {
throw new NotAVideoFile(); throw new NotAVideoFile();
} }
return getVideoDimensions(metadataRetriever);
}
private static Dimensions getVideoDimensions(Context context, Uri uri) throws NotAVideoFile {
MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
mediaMetadataRetriever.setDataSource(context,uri);
return getVideoDimensions(mediaMetadataRetriever);
}
private static Dimensions getVideoDimensions(MediaMetadataRetriever metadataRetriever) throws NotAVideoFile {
String hasVideo = metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO); String hasVideo = metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO);
if (hasVideo == null) { if (hasVideo == null) {
throw new NotAVideoFile(); throw new NotAVideoFile();
@ -840,7 +862,7 @@ public class FileBackend {
return rotated ? new Dimensions(width, height) : new Dimensions(height, width); return rotated ? new Dimensions(width, height) : new Dimensions(height, width);
} }
private int extractRotationFromMediaRetriever(MediaMetadataRetriever metadataRetriever) { private static int extractRotationFromMediaRetriever(MediaMetadataRetriever metadataRetriever) {
int rotation; int rotation;
if (Build.VERSION.SDK_INT >= 17) { if (Build.VERSION.SDK_INT >= 17) {
String r = metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); String r = metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION);
@ -855,7 +877,7 @@ public class FileBackend {
return rotation; return rotation;
} }
private class Dimensions { private static class Dimensions {
public final int width; public final int width;
public final int height; public final int height;
@ -863,9 +885,13 @@ public class FileBackend {
this.width = width; this.width = width;
this.height = height; this.height = height;
} }
public int getMin() {
return Math.min(width,height);
}
} }
private class NotAVideoFile extends Exception { private static class NotAVideoFile extends Exception {
} }

12
src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
View file

@ -11,6 +11,8 @@ import net.ypresto.androidtranscoder.format.MediaFormatStrategyPresets;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
@ -78,11 +80,15 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod
final DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message); final DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message);
final int runtime = mXmppConnectionService.getFileBackend().getMediaRuntime(uri); final int runtime = mXmppConnectionService.getFileBackend().getMediaRuntime(uri);
MediaFormatStrategy formatStrategy = runtime >= 8000 ? MediaFormatStrategyPresets.createExportPreset960x540Strategy() : MediaFormatStrategyPresets.createAndroid720pStrategy(); MediaFormatStrategy formatStrategy = runtime >= 8000 ? MediaFormatStrategyPresets.createExportPreset960x540Strategy() : MediaFormatStrategyPresets.createAndroid720pStrategy();
Log.d(Config.LOGTAG,"runtime "+runtime);
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
ParcelFileDescriptor parcelFileDescriptor = mXmppConnectionService.getContentResolver().openFileDescriptor(uri, "r"); ParcelFileDescriptor parcelFileDescriptor = mXmppConnectionService.getContentResolver().openFileDescriptor(uri, "r");
FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor(); FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
MediaTranscoder.getInstance().transcodeVideo(fileDescriptor, file.getAbsolutePath(), formatStrategy, this); Future<Void> future = MediaTranscoder.getInstance().transcodeVideo(fileDescriptor, file.getAbsolutePath(), formatStrategy, this);
try {
future.get();
} catch (Exception e) {
throw new AssertionError(e);
}
} }
@Override @Override
@ -114,7 +120,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod
@Override @Override
public void onTranscodeFailed(Exception e) { public void onTranscodeFailed(Exception e) {
mXmppConnectionService.stopForcingForegroundNotification(); mXmppConnectionService.stopForcingForegroundNotification();
Log.d(Config.LOGTAG,"video transcoding failed "+e.getMessage()); Log.d(Config.LOGTAG,"video transcoding failed",e);
processAsFile(); processAsFile();
} }