thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make video resolution configurable

Browse source
This commit is contained in:
Christian Schneppe 2017-03-04 22:00:46 +01:00
parent e1a7a2738d
commit 33f0f1561b
7 changed files with 144 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
libs/android-transcoder/src/main/java/net/ypresto/androidtranscoder/format/AndroidStandardFormatStrategy.java Normal file
View file

@ -0,0 +1,91 @@
/*
* Copyright (C) 2014 Yuya Tanaka
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.ypresto.androidtranscoder.format;
import android.media.MediaCodecInfo;
import android.media.MediaFormat;
import android.util.Log;
class AndroidStandardFormatStrategy implements MediaFormatStrategy {
public static final int AUDIO_BITRATE_AS_IS = -1;
public static final int AUDIO_CHANNELS_AS_IS = -1;
private static final String TAG = "StandardCompression";
private static final int DEFAULT_VIDEO_BITRATE = 2000 * 1000;
private static int LONGER_LENGTH = 1280;
private static int SHORTER_LENGTH = 720;
private final int mVideoBitrate;
private final int mVideoresolution;
private final int mAudioBitrate;
private final int mAudioChannels;
private float ASPECT_RATIO = LONGER_LENGTH / SHORTER_LENGTH;
public AndroidStandardFormatStrategy() {
this(DEFAULT_VIDEO_BITRATE, SHORTER_LENGTH);
}
public AndroidStandardFormatStrategy(int videoBitrate, int SHORTER_LENGTH) {
this(videoBitrate, SHORTER_LENGTH, AUDIO_BITRATE_AS_IS, AUDIO_CHANNELS_AS_IS);
}
public AndroidStandardFormatStrategy(int videoBitrate, int SHORTER_LENGTH, int audioBitrate, int audioChannels) {
mVideoBitrate = videoBitrate;
mVideoresolution = SHORTER_LENGTH;
mAudioBitrate = audioBitrate;
mAudioChannels = audioChannels;
}
@Override
public MediaFormat createVideoOutputFormat(MediaFormat inputFormat) {
int width = inputFormat.getInteger(MediaFormat.KEY_WIDTH);
int height = inputFormat.getInteger(MediaFormat.KEY_HEIGHT);
ASPECT_RATIO = (float) width / height;
Log.d(TAG, "Input video (" + width + "x" + height + " ratio: " + ASPECT_RATIO);
int shorter, outWidth, outHeight;
if (width >= height) {
shorter = height;
outWidth = Math.round(mVideoresolution * ASPECT_RATIO);
outHeight = mVideoresolution;
} else {
shorter = width;
outWidth = mVideoresolution;
outHeight = Math.round(mVideoresolution * ASPECT_RATIO);
}
if (shorter < mVideoresolution) {
Log.d(TAG, "This video is less to " + mVideoresolution + "p, pass-through. (" + width + "x" + height + ")");
return null;
}
Log.d(TAG, "Converting video (" + outWidth + "x" + outHeight + " ratio: " + ASPECT_RATIO + ")");
MediaFormat format = MediaFormat.createVideoFormat("video/avc", outWidth, outHeight);
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) {
if (mAudioBitrate == AUDIO_BITRATE_AS_IS || mAudioChannels == AUDIO_CHANNELS_AS_IS)
return null;
// Use original sample rate, as resampling is not supported yet.
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;
}
}

9
libs/android-transcoder/src/main/java/net/ypresto/androidtranscoder/format/MediaFormatStrategyPresets.java
View file

@ -25,6 +25,15 @@ public class MediaFormatStrategyPresets {
@Deprecated
public static final MediaFormatStrategy EXPORT_PRESET_960x540 = new ExportPreset960x540Strategy();
/**
* Standard preset
*
* @param bitrate Preferred bitrate for video encoding.
*/
public static MediaFormatStrategy createAndroidStandardStrategy(int bitrate, int resolution) {
return new AndroidStandardFormatStrategy(bitrate, resolution);
}
/**
* Preset based on Nexus 4 camera recording with 720p quality.
* This preset is ensured to work on any Android &gt;=4.3 devices by Android CTS (if codec is available).

15
src/main/java/de/pixart/messenger/services/XmppConnectionService.java
View file

@ -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;

5
src/main/res/values-de/strings.xml
View file

@ -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>

12
src/main/res/values/arrays.xml
View file

@ -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>

7
src/main/res/values/strings.xml
View file

@ -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>

7
src/main/res/xml/preferences.xml
View file

@ -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