Skip to content

FFmpegOutputBuilder - Minor tweaks #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramp merged 1 commit into from
Jun 22, 2016
Merged

FFmpegOutputBuilder - Minor tweaks #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions src/main/java/net/bramp/ffmpeg/builder/FFmpegOutputBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.concurrent.TimeUnit;

import static com.google.common.base.Preconditions.*;
import com.google.common.collect.Range;
import static net.bramp.ffmpeg.FFmpegUtils.millisecondsToString;
import static net.bramp.ffmpeg.builder.MetadataSpecifier.checkValidKey;

Expand All @@ -40,8 +41,8 @@ public class FFmpegOutputBuilder {

public String format;

public Long startOffset; // in millis
public Long duration; // in millis
public Long startOffset; // in milliseconds
public Long duration; // in milliseconds

public final List<String> meta_tags = new ArrayList<>();

Expand Down Expand Up @@ -174,7 +175,7 @@ public FFmpegOutputBuilder setFormat(String format) {
}

public FFmpegOutputBuilder setVideoBitRate(long bit_rate) {
Preconditions.checkArgument(bit_rate > 0, "bitrate must be positive");
Preconditions.checkArgument(bit_rate > 0, "bit rate must be positive");
this.video_enabled = true;
this.video_bit_rate = bit_rate;
return this;
Expand Down Expand Up @@ -387,20 +388,20 @@ public FFmpegOutputBuilder setAudioBitDepth(String bit_depth) {
}

/**
* Sets the Audio bitrate
* Sets the Audio bit rate
*
* @param bit_rate
* @return this
*/
public FFmpegOutputBuilder setAudioBitRate(long bit_rate) {
Preconditions.checkArgument(bit_rate > 0, "bitrate must be positive");
Preconditions.checkArgument(bit_rate > 0, "bit rate must be positive");
this.audio_enabled = true;
this.audio_bit_rate = bit_rate;
return this;
}

public FFmpegOutputBuilder setAudioQuality(int quality) {
Preconditions.checkArgument(quality >= 1 && quality <= 5, "quality must be in the range 1..5");
Preconditions.checkArgument(Range.closed(1,5).contains(quality), "quality must be in the range 1..5");
this.audio_enabled = true;
this.audio_quality = quality;
return this;
Expand Down Expand Up @@ -465,7 +466,7 @@ public FFmpegOutputBuilder setStrict(FFmpegBuilder.Strict strict) {
/**
* When doing multi-pass we add a little extra padding, to ensure we reach our target
*
* @param bitrate
* @param bitrate bit rate
* @return this
*/
public FFmpegOutputBuilder setPassPaddingBitrate(long bitrate) {
Expand Down Expand Up @@ -516,7 +517,7 @@ protected List<String> build(int pass) {
if (targetSize > 0) {
checkState(parent.inputs.size() == 1, "Target size does not support multiple inputs");

String firstInput = parent.inputs.get(0);
String firstInput = parent.inputs.iterator().next();
Copy link
Copy Markdown
Owner

@bramp bramp Jun 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than get(0)?

Copy link
Copy Markdown
Contributor Author

@stonio stonio Jun 22, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you later replace List by Collection the trick .iterator().next() still works.

Reference: http://stackoverflow.com/questions/1671378/java-get-first-item-from-a-collection

Copy link
Copy Markdown
Owner

@bramp bramp Jun 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, sure, it just seems a little less readable. But I'm not hugely concerned either way.

FFmpegProbeResult input = parent.inputProbes.get(firstInput);

checkState(input != null, "Target size must be used with setInput(FFmpegProbeResult)");
Expand All @@ -540,68 +541,66 @@ protected List<String> build(int pass) {
}

if (strict != FFmpegBuilder.Strict.NORMAL) {
args.add("-strict").add(strict.toString());
args.add("-strict", strict.toString());
}

if (!Strings.isNullOrEmpty(format)) {
args.add("-f").add(format);
args.add("-f", format);
}

if (startOffset != null) {
args.add("-ss").add(millisecondsToString(startOffset));
args.add("-ss", millisecondsToString(startOffset));
}

if (duration != null) {
args.add("-t").add(millisecondsToString(duration));
args.add("-t", millisecondsToString(duration));
}

for (String meta : meta_tags) {
args.add(meta);
}
args.addAll(meta_tags);

if (video_enabled) {

if (video_frames != null) {
args.add("-vframes").add(String.format("%d", video_frames));
args.add("-vframes", video_frames.toString());
}

if (!Strings.isNullOrEmpty(video_codec)) {
args.add("-vcodec").add(video_codec);
args.add("-vcodec", video_codec);
}

if (video_copyinkf) {
args.add("-copyinkf");
}

if (!Strings.isNullOrEmpty(video_movflags)) {
args.add("-movflags").add(video_movflags);
args.add("-movflags", video_movflags);
}

if (video_width != 0 && video_height != 0) {
args.add("-s").add(String.format("%dx%d", video_width, video_height));
args.add("-s", String.format("%dx%d", video_width, video_height));
}

if (video_frame_rate != null) {
// args.add("-r").add(String.format("%2f", video_frame_rate));
args.add("-r").add(video_frame_rate.toString());
// args.add("-r", String.format("%2f", video_frame_rate));
args.add("-r", video_frame_rate.toString());
}

if (video_bit_rate > 0) {
args.add("-b:v").add(String.format("%d", video_bit_rate));
args.add("-b:v", String.valueOf(video_bit_rate));
}

if (!Strings.isNullOrEmpty(video_preset)) {
args.add("-vpre").add(video_preset);
args.add("-vpre", video_preset);
}

if (!Strings.isNullOrEmpty(video_filter)) {
checkState(parent.inputs.size() == 1,
"Video filter only works with one input, instead use setVideoFilterComplex(..)");
args.add("-vf").add(video_filter);
args.add("-vf", video_filter);
}

if (!Strings.isNullOrEmpty(video_filter_complex)) {
args.add("-filter_complex").add(video_filter_complex);
args.add("-filter_complex", video_filter_complex);
}

if (!Strings.isNullOrEmpty(video_bit_stream_filter)) {
Expand All @@ -614,19 +613,19 @@ protected List<String> build(int pass) {

if (audio_enabled && pass != 1) {
if (!Strings.isNullOrEmpty(audio_codec)) {
args.add("-acodec").add(audio_codec);
args.add("-acodec", audio_codec);
}

if (audio_channels > 0) {
args.add("-ac").add(String.format("%d", audio_channels));
args.add("-ac", String.valueOf(audio_channels));
}

if (audio_sample_rate > 0) {
args.add("-ar").add(String.format("%d", audio_sample_rate));
args.add("-ar", String.valueOf(audio_sample_rate));
}

if (!Strings.isNullOrEmpty(audio_bit_depth)) {
args.add("-sample_fmt").add(audio_bit_depth);
args.add("-sample_fmt", audio_bit_depth);
}

if (audio_bit_rate > 0 && audio_quality > 0 && throwWarnings) {
Expand All @@ -636,11 +635,11 @@ protected List<String> build(int pass) {
}

if (audio_bit_rate > 0) {
args.add("-b:a").add(String.format("%d", audio_bit_rate));
args.add("-b:a", String.valueOf(audio_bit_rate));
}

if (audio_quality > 0) {
args.add("-aq").add(String.format("%d", audio_quality));
args.add("-aq", String.valueOf(audio_quality));
}

if (!Strings.isNullOrEmpty(audio_bit_stream_filter)) {
Expand All @@ -651,9 +650,10 @@ protected List<String> build(int pass) {
args.add("-an");
}

if (!subtitle_enabled)
if (!subtitle_enabled) {
args.add("-sn");

}

args.addAll(extra_args);

if (filename != null && uri != null) {
Expand Down