aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-08-30 22:35:03 +0200
committerChristian Schneppe <christian@pix-art.de>2016-08-30 22:35:03 +0200
commitbca4507864ef74ad6923f0b9f350c90f533942f4 (patch)
tree03f82614039d55a3182ae4138ab9cab48d285621 /src/main
parent0562d9e3c7041f1cc4e558478e6e3411bc0761f3 (diff)
make bitrate configurable via config.java
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/Config.java3
-rw-r--r--src/main/java/de/pixart/messenger/utils/video/MediaController.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 01bec77cf..d9b0cf551 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -80,8 +80,9 @@ public final class Config {
public static final int IMAGE_SIZE = 1920;
public static final Bitmap.CompressFormat IMAGE_FORMAT = Bitmap.CompressFormat.JPEG;
public static final int IMAGE_QUALITY = 75;
+ public static final int VIDEO_BITRATE = 250000;
public static final int IMAGE_MAX_SIZE = 524288; //512 KiB
- public static final int VIDEO_MAX_SIZE = 10485760; //10 MiB
+ public static final int VIDEO_MAX_SIZE = 5242880; //5 MiB
public static final int FILE_MAX_SIZE = 1048576; //1 MiB
public static final int DEFAULT_ZOOM = 15; //for locations
diff --git a/src/main/java/de/pixart/messenger/utils/video/MediaController.java b/src/main/java/de/pixart/messenger/utils/video/MediaController.java
index 2f60310a8..61826f9db 100644
--- a/src/main/java/de/pixart/messenger/utils/video/MediaController.java
+++ b/src/main/java/de/pixart/messenger/utils/video/MediaController.java
@@ -204,7 +204,7 @@ public class MediaController {
int originalHeight = Integer.valueOf(height);
double ratio = video_width/video_height;
- int bitrate = 50000; //450000
+ int bitrate = Config.VIDEO_BITRATE;
int rotateRender = 0;
File cacheFile = new File(compressed_path);