diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 15 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 5 | ||||
| -rw-r--r-- | src/main/res/values/arrays.xml | 12 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 7 |
5 files changed, 44 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index b2b3e5d68..1a662356e 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -555,7 +555,7 @@ public class XmppConnectionService extends Service { } }; MediaTranscoder.getInstance().transcodeVideo(fileDescriptor, file.getAbsolutePath(), - MediaFormatStrategyPresets.createAndroid720pStrategy(Config.VIDEO_BITRATE), listener); + MediaFormatStrategyPresets.createAndroidStandardStrategy(Config.VIDEO_BITRATE, getCompressVideosPreference()), listener); } @Override @@ -882,6 +882,19 @@ public class XmppConnectionService extends Service { return getPreferences().getString("picture_compression", "auto"); } + private int getCompressVideosPreference() { + switch (getPreferences().getString("video_compression", "high")) { + case "low": + return 144; + case "mid": + return 360; + case "high": + return 720; + default: + return 720; + } + } + private Presence.Status getTargetPresence() { if (xaOnSilentMode() && isPhoneSilenced()) { return Presence.Status.XA; diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 2da868dfd..ae3d33496 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -692,5 +692,10 @@ <string name="start_chatting">Fange an zu schreiben…</string> <string name="pref_use_max_brightness">Maximale Helligkeit</string> <string name="pref_use_max_brightness_summary">Maximale Helligkeit aktivieren, wenn Videos oder Bilder im Vollbild betracht werden.</string> + <string name="pref_video_compression">Videos komprimieren</string> + <string name="pref_video_compression_summary">Videogröße anpassen und komprimieren</string> + <string name="video_high">hoch (720p)</string> + <string name="video_low">niedrig (144p)</string> + <string name="video_mid">mittelmäßig (360p)</string> </resources> diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index c0f9ca881..b61a512ae 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -70,6 +70,18 @@ <item>@string/always</item> </string-array> + <string-array name="video_compression_values"> + <item>low</item> + <item>mid</item> + <item>high</item> + </string-array> + + <string-array name="video_compression_entries"> + <item>@string/video_low</item> + <item>@string/video_mid</item> + <item>@string/video_high</item> + </string-array> + <string-array name="mam_prefs"> <item>@string/never</item> <item>@string/contacts</item> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index fd109379b..0003d131e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -584,8 +584,13 @@ <string name="notify_only_when_highlighted">Notify only when highlighted</string> <string name="notify_never">Notifications disabled</string> <string name="notify_paused">Notifications paused</string> - <string name="pref_picture_compression">Compress Pictures</string> + <string name="pref_picture_compression">Compress pictures</string> <string name="pref_picture_compression_summary">Resize and compress pictures</string> + <string name="pref_video_compression">Compress videos</string> + <string name="pref_video_compression_summary">Resize and compress videos</string> + <string name="video_low">low (144p)</string> + <string name="video_mid">middle (360p)</string> + <string name="video_high">high (720p)</string> <string name="always">Always</string> <string name="automatically">Automatically</string> <string name="battery_optimizations_enabled">Battery optimizations enabled</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index fe21e2390..ba428aeb3 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -120,6 +120,13 @@ android:key="picture_compression" android:summary="@string/pref_picture_compression_summary" android:title="@string/pref_picture_compression" /> + <ListPreference + android:defaultValue="720" + android:entries="@array/video_compression_entries" + android:entryValues="@array/video_compression_values" + android:key="video_compression" + android:summary="@string/pref_video_compression_summary" + android:title="@string/pref_video_compression" /> </PreferenceScreen> <!--status--> <PreferenceScreen |