X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2Fconverters%2FAvconvVideo.java;h=be3936510b3d2c387f26baf2533d3fbc4bdedc1d;hb=934d5b7cc3d7d4bbafda7fbb4fab47d54f1a8a91;hp=9228317eecf77d0df9afa17b100dd75b3514dbaf;hpb=10d7d28a798d1e54e2dfd24fef8478756e07a891;p=meviz.git 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..be39365 100644 --- 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. - * 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 @@ -9,8 +9,7 @@ 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; @@ -46,7 +45,7 @@ public class AvconvVideo extends AbstractConverter { return codecParams.toString(); } - private int getAudioBitrateValue(final BitrateParameter.bitrate bitRate) { + private int getAudioBitrateValue(final Bitrate bitRate) { switch (bitRate) { case LOW: return 128; @@ -88,13 +87,13 @@ public class AvconvVideo extends AbstractConverter { codecParams.append("-s 800x600 "); } - if (options.getVideoBitrate() == bitrate.COPY) + if (options.getVideoBitrate() == Bitrate.COPY) videoCodec = "copy"; - if (options.getAudioBitrate() == bitrate.COPY) + if (options.getAudioBitrate() == Bitrate.COPY) audioCodec = "copy"; - if (options.getAudioBitrate() == bitrate.NONE) + if (options.getAudioBitrate() == Bitrate.NONE) audioCodec = null; if (options.isForPortablePlayer()) { @@ -129,7 +128,7 @@ public class AvconvVideo extends AbstractConverter { "webm", "mov"); } - private int getVideoBitrateValue(final BitrateParameter.bitrate bitRate) { + private int getVideoBitrateValue(final Bitrate bitRate) { switch (bitRate) { case LOW: return 1000;