projects
/
meviz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code formatting
[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
be39365
..
4ea5380
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 -- 201
7
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012 -- 201
8
, 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
@@
-84,7
+84,7
@@
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() == Bitrate.COPY)
}
if (options.getVideoBitrate() == Bitrate.COPY)
@@
-118,14
+118,17
@@
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", "3gp"
);
}
@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 bitRate) {
}
private int getVideoBitrateValue(final Bitrate bitRate) {