projects
/
meviz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
possibility to change video framerate
[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
3d3393b
..
4d2743a
100644
(file)
--- a/
src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
+++ b/
src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
@@
-22,7
+22,7
@@
public class AvconvVideo extends AbstractConverter {
final int videoBitrate, final int audioBitrate,
final String videoCodec, final String audioCodec) {
final int videoBitrate, final int audioBitrate,
final String videoCodec, final String audioCodec) {
- StringBuffer codecParams = new StringBuffer();
+
final
StringBuffer codecParams = new StringBuffer();
if (audioCodec == null)
codecParams.append("-an ");
if (audioCodec == null)
codecParams.append("-an ");
@@
-40,6
+40,9
@@
public class AvconvVideo extends AbstractConverter {
if (options.isDeinterlace())
codecParams.append("-filter:v yadif ");
if (options.isDeinterlace())
codecParams.append("-filter:v yadif ");
+ if (options.getTargetFps() != null)
+ codecParams.append("-r " + options.getTargetFps() + " ");
+
return codecParams.toString();
}
return codecParams.toString();
}
@@
-68,7
+71,7
@@
public class AvconvVideo extends AbstractConverter {
@Override
public String getCommand(final File inputFile, final File targetFile,
@Override
public String getCommand(final File inputFile, final File targetFile,
- final EncodingOptions options, String targetFormat) {
+ final EncodingOptions options,
final
String targetFormat) {
int videoBitrate = getVideoBitrateValue(options.getVideoBitrate());
int audioBitrate = getAudioBitrateValue(options.getAudioBitrate());
int videoBitrate = getVideoBitrateValue(options.getVideoBitrate());
int audioBitrate = getAudioBitrateValue(options.getAudioBitrate());
@@
-135,7
+138,7
@@
public class AvconvVideo extends AbstractConverter {
return 4000;
case HIGH:
return 4000;
case HIGH:
- return
40
000;
+ return
16
000;
case COPY:
return -1;
case COPY:
return -1;