Skip to content
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

Jump to bottom

Fix logic for cutting video #77

Merged
merged 1 commit into from
May 18, 2018
Merged

Fix logic for cutting video #77

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
19 changes: 11 additions & 8 deletions app/src/main/java/protect/videotranscoder/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@ public void onResult(MediaInfo result)
{
if(result != null)
{
startEncode(inputFilePath, 0, (int)(result.durationMs/1000), container, videoCodec, videoBitrateK,
int durationSec = (int)(result.durationMs/1000);
startEncode(inputFilePath, 0, durationSec, durationSec, container, videoCodec, videoBitrateK,
resolution, fps, audioCodec, audioSampleRate, audioChannel, audioBitrateK, destinationFilePath);
}
else
Expand Down Expand Up @@ -521,7 +522,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
}
}

private List<String> getFfmpegEncodingArgs(String inputFilePath, Integer startTimeSec, Integer endTimeSec,
private List<String> getFfmpegEncodingArgs(String inputFilePath, Integer startTimeSec, Integer endTimeSec, Integer fullDurationSec,
MediaContainer container, VideoCodec videoCodec, Integer videoBitrateK,
String resolution, String fps, AudioCodec audioCodec, Integer audioSampleRate,
String audioChannel, Integer audioBitrateK, String destinationFilePath)
Expand All @@ -544,13 +545,13 @@ private List<String> getFfmpegEncodingArgs(String inputFilePath, Integer startTi

if(startTimeSec != null && endTimeSec != null)
{
int durationSec = endTimeSec - startTimeSec;
int subDurationSec = endTimeSec - startTimeSec;

if (durationSec != endTimeSec)
if (fullDurationSec != subDurationSec)
{
// Duration of media file
command.add("-t");
command.add(Integer.toString(durationSec));
command.add(Integer.toString(subDurationSec));
}
}

Expand Down Expand Up @@ -625,12 +626,12 @@ private List<String> getFfmpegEncodingArgs(String inputFilePath, Integer startTi
return command;
}

private void startEncode(String inputFilePath, Integer startTimeSec, Integer endTimeSec,
private void startEncode(String inputFilePath, Integer startTimeSec, Integer endTimeSec, Integer fullDurationSec,
MediaContainer container, VideoCodec videoCodec, Integer videoBitrateK,
String resolution, String fps, AudioCodec audioCodec, Integer audioSampleRate,
String audioChannel, Integer audioBitrateK, String destinationFilePath)
{
List<String> args = getFfmpegEncodingArgs(inputFilePath, startTimeSec, endTimeSec,
List<String> args = getFfmpegEncodingArgs(inputFilePath, startTimeSec, endTimeSec, fullDurationSec,
container, videoCodec, videoBitrateK, resolution, fps, audioCodec, audioSampleRate,
audioChannel, audioBitrateK, destinationFilePath);

Expand Down Expand Up @@ -710,7 +711,9 @@ private void startEncode()
int startTimeSec = rangeSeekBar.getSelectedMinValue().intValue();
int endTimeSec = rangeSeekBar.getSelectedMaxValue().intValue();

startEncode(inputFilePath, startTimeSec, endTimeSec, container, videoCodec,
int durationSec = (int)(videoInfo.durationMs/1000);

startEncode(inputFilePath, startTimeSec, endTimeSec, durationSec, container, videoCodec,
videoBitrateK, resolution, fps, audioCodec, audioSampleRate, audioChannel,
audioBitrateK, destination.getAbsolutePath());
}
Expand Down