projects
/
meviz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed aspect ratio of WEBM files
[meviz.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
meviz
/
encoder
/
converters
/
AvconvVideo.java
diff --git
a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
index
9228317
..
2492b52
100644
(file)
--- a/
src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
+++ b/
src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
@@
-1,6
+1,6
@@
/*
* Meviz - Various tools collection to work with multimedia.
/*
* Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012
-- 2017
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public License
@@
-9,8
+9,7
@@
package eu.svjatoslav.meviz.encoder.converters;
package eu.svjatoslav.meviz.encoder.converters;
-import eu.svjatoslav.meviz.encoder.BitrateParameter;
-import eu.svjatoslav.meviz.encoder.BitrateParameter.bitrate;
+import eu.svjatoslav.meviz.encoder.BitrateParameter.Bitrate;
import eu.svjatoslav.meviz.encoder.EncodingOptions;
import java.io.File;
import eu.svjatoslav.meviz.encoder.EncodingOptions;
import java.io.File;
@@
-46,7
+45,7
@@
public class AvconvVideo extends AbstractConverter {
return codecParams.toString();
}
return codecParams.toString();
}
- private int getAudioBitrateValue(final Bitrate
Parameter.bitrate
bitRate) {
+ private int getAudioBitrateValue(final Bitrate bitRate) {
switch (bitRate) {
case LOW:
return 128;
switch (bitRate) {
case LOW:
return 128;
@@
-85,16
+84,16
@@
public class AvconvVideo extends AbstractConverter {
if (targetFormat.equals("webm")) {
videoCodec = "vp8";
audioCodec = "opus";
if (targetFormat.equals("webm")) {
videoCodec = "vp8";
audioCodec = "opus";
- codecParams.append("-s 800x
60
0 ");
+ codecParams.append("-s 800x
45
0 ");
}
}
- if (options.getVideoBitrate() ==
b
itrate.COPY)
+ if (options.getVideoBitrate() ==
B
itrate.COPY)
videoCodec = "copy";
videoCodec = "copy";
- if (options.getAudioBitrate() ==
b
itrate.COPY)
+ if (options.getAudioBitrate() ==
B
itrate.COPY)
audioCodec = "copy";
audioCodec = "copy";
- if (options.getAudioBitrate() ==
b
itrate.NONE)
+ if (options.getAudioBitrate() ==
B
itrate.NONE)
audioCodec = null;
if (options.isForPortablePlayer()) {
audioCodec = null;
if (options.isForPortablePlayer()) {
@@
-119,17
+118,20
@@
public class AvconvVideo extends AbstractConverter {
@Override
public List<String> getSourceFileExtensions() {
@Override
public List<String> getSourceFileExtensions() {
+ return getSupportedExtensions();
+ }
+
+ private List<String> getSupportedExtensions() {
return toList("mkv", "mts", "mp4", "avi", "mpg", "mpeg", "vob", "m4v",
return toList("mkv", "mts", "mp4", "avi", "mpg", "mpeg", "vob", "m4v",
- "webm", "mov");
+ "webm", "mov"
, "asf"
);
}
@Override
public List<String> getTargetFileExtensions() {
}
@Override
public List<String> getTargetFileExtensions() {
- return toList("mkv", "mts", "mp4", "avi", "mpg", "mpeg", "vob", "m4v",
- "webm", "mov");
+ return getSupportedExtensions();
}
}
- private int getVideoBitrateValue(final Bitrate
Parameter.bitrate
bitRate) {
+ private int getVideoBitrateValue(final Bitrate bitRate) {
switch (bitRate) {
case LOW:
return 1000;
switch (bitRate) {
case LOW:
return 1000;