You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/05/02 17:45:35 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2327] video
dimentions are corrected to be dividable by 2
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new ba0d7f3 [OPENMEETINGS-2327] video dimentions are corrected to be dividable by 2
ba0d7f3 is described below
commit ba0d7f3a3ec387f1f78152a2f64652127373f0c5
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun May 3 00:45:20 2020 +0700
[OPENMEETINGS-2327] video dimentions are corrected to be dividable by 2
---
.../openmeetings/core/converter/BaseConverter.java | 23 +++++++++++-----------
.../core/converter/VideoConverter.java | 4 +++-
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index cbcc7d2..5599b11 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -315,17 +315,18 @@ public abstract class BaseConverter {
private List<String> addMp4OutParams(Recording r, List<String> argv, String mp4path) {
argv.addAll(List.of(
- "-c:v", "h264", //
- "-crf", "24",
- "-vsync", "0",
- "-pix_fmt", "yuv420p",
- "-preset", getVideoPreset(),
- "-profile:v", "baseline",
- "-level", "3.0",
- "-movflags", "faststart",
- "-c:a", "aac",
- "-ar", String.valueOf(getAudioRate()),
- "-b:a", getAudioBitrate()
+ "-c:v", "h264" //
+ , "-crf", "24"
+ , "-vsync", "0"
+ , "-pix_fmt", "yuv420p"
+ , "-vf", "pad=ceil(iw/2)*2:ceil(ih/2)*2"
+ , "-preset", getVideoPreset()
+ , "-profile:v", "baseline"
+ , "-level", "3.0"
+ , "-movflags", "faststart"
+ , "-c:a", "aac"
+ , "-ar", String.valueOf(getAudioRate())
+ , "-b:a", getAudioBitrate()
));
argv.addAll(additionalMp4OutParams(r));
argv.add(mp4path);
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/VideoConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/VideoConverter.java
index 660b568..0f444ae 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/VideoConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/VideoConverter.java
@@ -69,7 +69,9 @@ public class VideoConverter extends BaseConverter {
args.addAll(List.of("-i", input //
, "-c:v", "h264" //
, "-c:a", "aac" //
- , "-pix_fmt", "yuv420p"));
+ , "-pix_fmt", "yuv420p"
+ , "-vf", "pad=ceil(iw/2)*2:ceil(ih/2)*2"
+ ));
if (sf.isAudio()) {
args.add("-shortest");
}