From fcccf545ba21c75a4438a1522f6f134a95046cc5 Mon Sep 17 00:00:00 2001 From: licaon-kter Date: Sat, 6 Oct 2018 17:15:32 +0300 Subject: [PATCH 1/3] Add video compression selector --- .../AttachFileToConversationRunnable.java | 21 +++++- .../utils/Android1080pFormatStrategy.java | 69 +++++++++++++++++++ ...gy.java => Android720pFormatStrategy.java} | 10 +-- src/main/res/values/arrays.xml | 12 ++++ src/main/res/values/defaults.xml | 1 + src/main/res/values/strings.xml | 5 ++ src/main/res/xml/preferences.xml | 7 ++ 7 files changed, 117 insertions(+), 8 deletions(-) create mode 100644 src/main/java/eu/siacs/conversations/utils/Android1080pFormatStrategy.java rename src/main/java/eu/siacs/conversations/utils/{Android480pFormatStrategy.java => Android720pFormatStrategy.java} (91%) diff --git a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java index 039f2dcb2..3197f732c 100644 --- a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java +++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java @@ -24,7 +24,8 @@ import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.persistance.FileBackend; import eu.siacs.conversations.ui.UiCallback; import eu.siacs.conversations.utils.Android360pFormatStrategy; -import eu.siacs.conversations.utils.Android480pFormatStrategy; +import eu.siacs.conversations.utils.Android720pFormatStrategy; +import eu.siacs.conversations.utils.Android1080pFormatStrategy; import eu.siacs.conversations.utils.MimeUtils; public class AttachFileToConversationRunnable implements Runnable, MediaTranscoder.Listener { @@ -91,8 +92,22 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod mXmppConnectionService.startForcingForegroundNotification(); message.setRelativeFilePath(message.getUuid() + ".mp4"); final DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message); - final int runtime = mXmppConnectionService.getFileBackend().getMediaRuntime(uri); - final MediaFormatStrategy formatStrategy = runtime >= 20000 ? new Android360pFormatStrategy() : new Android480pFormatStrategy(); + final MediaFormatStrategy formatStrategy; + final String compressVideo = mXmppConnectionService.getResources().getString(R.string.video_compression); + switch (compressVideo) { + case "720": + formatStrategy = new Android720pFormatStrategy(); + Log.d(Config.LOGTAG,"WOOOMP 720 dar " + compressVideo); + break; + case "1080": + formatStrategy = new Android1080pFormatStrategy(); + Log.d(Config.LOGTAG,"WOOOMP 1080 dar " + compressVideo); + break; + default: + formatStrategy = new Android360pFormatStrategy(); + Log.d(Config.LOGTAG,"WOOOMP 360 dar" + compressVideo); + break; + } file.getParentFile().mkdirs(); final ParcelFileDescriptor parcelFileDescriptor = mXmppConnectionService.getContentResolver().openFileDescriptor(uri, "r"); if (parcelFileDescriptor == null) { diff --git a/src/main/java/eu/siacs/conversations/utils/Android1080pFormatStrategy.java b/src/main/java/eu/siacs/conversations/utils/Android1080pFormatStrategy.java new file mode 100644 index 000000000..f3aea2e50 --- /dev/null +++ b/src/main/java/eu/siacs/conversations/utils/Android1080pFormatStrategy.java @@ -0,0 +1,69 @@ +package eu.siacs.conversations.utils; + +import android.media.MediaCodecInfo; +import android.media.MediaFormat; +import android.util.Log; + +import net.ypresto.androidtranscoder.format.MediaFormatExtraConstants; +import net.ypresto.androidtranscoder.format.MediaFormatStrategy; +import net.ypresto.androidtranscoder.format.OutputFormatUnavailableException; + +import eu.siacs.conversations.Config; + +public class Android1080pFormatStrategy implements MediaFormatStrategy { + + private static final int LONGER_LENGTH = 1920; + private static final int SHORTER_LENGTH = 1080; + private static final int DEFAULT_VIDEO_BITRATE = 4000 * 1000; + private static final int DEFAULT_AUDIO_BITRATE = 128 * 1000; + private final int mVideoBitrate; + private final int mAudioBitrate; + private final int mAudioChannels; + + public Android1080pFormatStrategy() { + mVideoBitrate = DEFAULT_VIDEO_BITRATE; + mAudioBitrate = DEFAULT_AUDIO_BITRATE; + mAudioChannels = 2; + } + + @Override + public MediaFormat createVideoOutputFormat(MediaFormat inputFormat) { + int width = inputFormat.getInteger(MediaFormat.KEY_WIDTH); + int height = inputFormat.getInteger(MediaFormat.KEY_HEIGHT); + int longer, shorter, outWidth, outHeight; + if (width >= height) { + longer = width; + shorter = height; + outWidth = LONGER_LENGTH; + outHeight = SHORTER_LENGTH; + } else { + shorter = width; + longer = height; + outWidth = SHORTER_LENGTH; + outHeight = LONGER_LENGTH; + } + if (longer * 9 != shorter * 16) { + throw new OutputFormatUnavailableException("This video is not 16:9, and is not able to transcode. (" + width + "x" + height + ")"); + } + if (shorter <= SHORTER_LENGTH) { + Log.d(Config.LOGTAG, "This video is less or equal to 1080p, pass-through. (" + width + "x" + height + ")"); + return null; + } + MediaFormat format = MediaFormat.createVideoFormat("video/avc", outWidth, outHeight); + // From Nexus 4 Camera in 720p + format.setInteger(MediaFormat.KEY_BIT_RATE, mVideoBitrate); + format.setInteger(MediaFormat.KEY_FRAME_RATE, 30); + format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 3); + format.setInteger(MediaFormat.KEY_COLOR_FORMAT, MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface); + return format; + } + + @Override + public MediaFormat createAudioOutputFormat(MediaFormat inputFormat) { + final MediaFormat format = MediaFormat.createAudioFormat(MediaFormatExtraConstants.MIMETYPE_AUDIO_AAC, inputFormat.getInteger(MediaFormat.KEY_SAMPLE_RATE), mAudioChannels); + format.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC); + format.setInteger(MediaFormat.KEY_BIT_RATE, mAudioBitrate); + return format; + } + +} diff --git a/src/main/java/eu/siacs/conversations/utils/Android480pFormatStrategy.java b/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java similarity index 91% rename from src/main/java/eu/siacs/conversations/utils/Android480pFormatStrategy.java rename to src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java index 197cc573a..39b2e433b 100644 --- a/src/main/java/eu/siacs/conversations/utils/Android480pFormatStrategy.java +++ b/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java @@ -10,17 +10,17 @@ import net.ypresto.androidtranscoder.format.OutputFormatUnavailableException; import eu.siacs.conversations.Config; -public class Android480pFormatStrategy implements MediaFormatStrategy { +public class Android720pFormatStrategy implements MediaFormatStrategy { - private static final int LONGER_LENGTH = 854; - private static final int SHORTER_LENGTH = 480; + private static final int LONGER_LENGTH = 1280; + private static final int SHORTER_LENGTH = 720; private static final int DEFAULT_VIDEO_BITRATE = 2000 * 1000; // 2000 kbit/s upper range of what YouTube recommends private static final int DEFAULT_AUDIO_BITRATE = 96 * 1000; private final int mVideoBitrate; private final int mAudioBitrate; private final int mAudioChannels; - public Android480pFormatStrategy() { + public Android720pFormatStrategy() { mVideoBitrate = DEFAULT_VIDEO_BITRATE; mAudioBitrate = DEFAULT_AUDIO_BITRATE; mAudioChannels = 2; @@ -46,7 +46,7 @@ public class Android480pFormatStrategy implements MediaFormatStrategy { throw new OutputFormatUnavailableException("This video is not 16:9, and is not able to transcode. (" + width + "x" + height + ")"); } if (shorter <= SHORTER_LENGTH) { - Log.d(Config.LOGTAG, "This video is less or equal to 360p, pass-through. (" + width + "x" + height + ")"); + Log.d(Config.LOGTAG, "This video is less or equal to 720p, pass-through. (" + width + "x" + height + ")"); return null; } MediaFormat format = MediaFormat.createVideoFormat("video/avc", outWidth, outHeight); diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 2be34fc4a..604c11515 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -112,4 +112,16 @@ @string/medium @string/large + + + 360 + 720 + 1080 + + + + @string/video_360p + @string/video_720p + @string/video_1080p + diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 35a3f0995..8e289f9c8 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -42,4 +42,5 @@ small false false + 360 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a72a5d3db..9f03159e1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -740,4 +740,9 @@ Media browser History export File omitted due to security violation. + Compress Videos + Resize and compress videos + SD (360p) + HD (720p) + Full HD (1080p) diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 19035595a..c7f4b159c 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -137,6 +137,13 @@ android:key="picture_compression" android:summary="@string/pref_picture_compression_summary" android:title="@string/pref_picture_compression" /> + Date: Sun, 7 Oct 2018 04:25:16 +0300 Subject: [PATCH 2/3] Fix selector, limit formats to 360 & 720 per CTS --- .../AttachFileToConversationRunnable.java | 27 +++----- .../utils/Android1080pFormatStrategy.java | 69 ------------------- .../utils/Android360pFormatStrategy.java | 4 +- .../utils/Android720pFormatStrategy.java | 4 +- src/main/res/values/arrays.xml | 2 - 5 files changed, 14 insertions(+), 92 deletions(-) delete mode 100644 src/main/java/eu/siacs/conversations/utils/Android1080pFormatStrategy.java diff --git a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java index 3197f732c..aff46ca1a 100644 --- a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java +++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java @@ -1,8 +1,10 @@ package eu.siacs.conversations.services; +import android.content.SharedPreferences; import android.net.Uri; import android.os.Build; import android.os.ParcelFileDescriptor; +import android.preference.PreferenceManager; import android.util.Log; import net.ypresto.androidtranscoder.MediaTranscoder; @@ -25,7 +27,6 @@ import eu.siacs.conversations.persistance.FileBackend; import eu.siacs.conversations.ui.UiCallback; import eu.siacs.conversations.utils.Android360pFormatStrategy; import eu.siacs.conversations.utils.Android720pFormatStrategy; -import eu.siacs.conversations.utils.Android1080pFormatStrategy; import eu.siacs.conversations.utils.MimeUtils; public class AttachFileToConversationRunnable implements Runnable, MediaTranscoder.Listener { @@ -92,22 +93,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod mXmppConnectionService.startForcingForegroundNotification(); message.setRelativeFilePath(message.getUuid() + ".mp4"); final DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message); - final MediaFormatStrategy formatStrategy; - final String compressVideo = mXmppConnectionService.getResources().getString(R.string.video_compression); - switch (compressVideo) { - case "720": - formatStrategy = new Android720pFormatStrategy(); - Log.d(Config.LOGTAG,"WOOOMP 720 dar " + compressVideo); - break; - case "1080": - formatStrategy = new Android1080pFormatStrategy(); - Log.d(Config.LOGTAG,"WOOOMP 1080 dar " + compressVideo); - break; - default: - formatStrategy = new Android360pFormatStrategy(); - Log.d(Config.LOGTAG,"WOOOMP 360 dar" + compressVideo); - break; - } + final MediaFormatStrategy formatStrategy = "720".equals(getVideoCompression()) ? new Android720pFormatStrategy() : new Android360pFormatStrategy(); file.getParentFile().mkdirs(); final ParcelFileDescriptor parcelFileDescriptor = mXmppConnectionService.getContentResolver().openFileDescriptor(uri, "r"); if (parcelFileDescriptor == null) { @@ -183,4 +169,11 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod } } + public String getVideoCompression() { + return getPreferences().getString("video_compression", mXmppConnectionService.getResources().getString(R.string.video_compression)); + } + + protected SharedPreferences getPreferences() { + return PreferenceManager.getDefaultSharedPreferences(mXmppConnectionService.getApplicationContext()); + } } diff --git a/src/main/java/eu/siacs/conversations/utils/Android1080pFormatStrategy.java b/src/main/java/eu/siacs/conversations/utils/Android1080pFormatStrategy.java deleted file mode 100644 index f3aea2e50..000000000 --- a/src/main/java/eu/siacs/conversations/utils/Android1080pFormatStrategy.java +++ /dev/null @@ -1,69 +0,0 @@ -package eu.siacs.conversations.utils; - -import android.media.MediaCodecInfo; -import android.media.MediaFormat; -import android.util.Log; - -import net.ypresto.androidtranscoder.format.MediaFormatExtraConstants; -import net.ypresto.androidtranscoder.format.MediaFormatStrategy; -import net.ypresto.androidtranscoder.format.OutputFormatUnavailableException; - -import eu.siacs.conversations.Config; - -public class Android1080pFormatStrategy implements MediaFormatStrategy { - - private static final int LONGER_LENGTH = 1920; - private static final int SHORTER_LENGTH = 1080; - private static final int DEFAULT_VIDEO_BITRATE = 4000 * 1000; - private static final int DEFAULT_AUDIO_BITRATE = 128 * 1000; - private final int mVideoBitrate; - private final int mAudioBitrate; - private final int mAudioChannels; - - public Android1080pFormatStrategy() { - mVideoBitrate = DEFAULT_VIDEO_BITRATE; - mAudioBitrate = DEFAULT_AUDIO_BITRATE; - mAudioChannels = 2; - } - - @Override - public MediaFormat createVideoOutputFormat(MediaFormat inputFormat) { - int width = inputFormat.getInteger(MediaFormat.KEY_WIDTH); - int height = inputFormat.getInteger(MediaFormat.KEY_HEIGHT); - int longer, shorter, outWidth, outHeight; - if (width >= height) { - longer = width; - shorter = height; - outWidth = LONGER_LENGTH; - outHeight = SHORTER_LENGTH; - } else { - shorter = width; - longer = height; - outWidth = SHORTER_LENGTH; - outHeight = LONGER_LENGTH; - } - if (longer * 9 != shorter * 16) { - throw new OutputFormatUnavailableException("This video is not 16:9, and is not able to transcode. (" + width + "x" + height + ")"); - } - if (shorter <= SHORTER_LENGTH) { - Log.d(Config.LOGTAG, "This video is less or equal to 1080p, pass-through. (" + width + "x" + height + ")"); - return null; - } - MediaFormat format = MediaFormat.createVideoFormat("video/avc", outWidth, outHeight); - // From Nexus 4 Camera in 720p - format.setInteger(MediaFormat.KEY_BIT_RATE, mVideoBitrate); - format.setInteger(MediaFormat.KEY_FRAME_RATE, 30); - format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 3); - format.setInteger(MediaFormat.KEY_COLOR_FORMAT, MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface); - return format; - } - - @Override - public MediaFormat createAudioOutputFormat(MediaFormat inputFormat) { - final MediaFormat format = MediaFormat.createAudioFormat(MediaFormatExtraConstants.MIMETYPE_AUDIO_AAC, inputFormat.getInteger(MediaFormat.KEY_SAMPLE_RATE), mAudioChannels); - format.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC); - format.setInteger(MediaFormat.KEY_BIT_RATE, mAudioBitrate); - return format; - } - -} diff --git a/src/main/java/eu/siacs/conversations/utils/Android360pFormatStrategy.java b/src/main/java/eu/siacs/conversations/utils/Android360pFormatStrategy.java index a931136a6..50de54b75 100644 --- a/src/main/java/eu/siacs/conversations/utils/Android360pFormatStrategy.java +++ b/src/main/java/eu/siacs/conversations/utils/Android360pFormatStrategy.java @@ -14,8 +14,8 @@ public class Android360pFormatStrategy implements MediaFormatStrategy { private static final int LONGER_LENGTH = 640; private static final int SHORTER_LENGTH = 360; - private static final int DEFAULT_VIDEO_BITRATE = 1000 * 1000; // 1000 kbit/s upper range of what YouTube recommends - private static final int DEFAULT_AUDIO_BITRATE = 96 * 1000; + private static final int DEFAULT_VIDEO_BITRATE = 1000 * 1000; + private static final int DEFAULT_AUDIO_BITRATE = 128 * 1000; private final int mVideoBitrate; private final int mAudioBitrate; private final int mAudioChannels; diff --git a/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java b/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java index 39b2e433b..5389c4260 100644 --- a/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java +++ b/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java @@ -14,8 +14,8 @@ public class Android720pFormatStrategy implements MediaFormatStrategy { private static final int LONGER_LENGTH = 1280; private static final int SHORTER_LENGTH = 720; - private static final int DEFAULT_VIDEO_BITRATE = 2000 * 1000; // 2000 kbit/s upper range of what YouTube recommends - private static final int DEFAULT_AUDIO_BITRATE = 96 * 1000; + private static final int DEFAULT_VIDEO_BITRATE = 2000 * 1000; + private static final int DEFAULT_AUDIO_BITRATE = 192 * 1000; private final int mVideoBitrate; private final int mAudioBitrate; private final int mAudioChannels; diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 604c11515..d5285e08a 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -116,12 +116,10 @@ 360 720 - 1080 @string/video_360p @string/video_720p - @string/video_1080p From 02be93ae6621848ce09cc63b9f7cd9dbc9811e35 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Sun, 7 Oct 2018 01:36:47 +0000 Subject: [PATCH 3/3] Fix leftover string --- src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9f03159e1..9698db8bf 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -744,5 +744,4 @@ Resize and compress videos SD (360p) HD (720p) - Full HD (1080p)