Skip to content

Commit

Permalink
New development version 2.3.1-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
a-schild committed Jun 22, 2018
1 parent 866365e commit ca5c6c7
Show file tree
Hide file tree
Showing 2 changed files with 135 additions and 134 deletions.
266 changes: 133 additions & 133 deletions jave-core/src/main/java/it/sauronsoftware/jave/DefaultFFMPEGLocator.java
Original file line number Diff line number Diff line change
@@ -1,133 +1,133 @@
/*
* JAVE - A Java Audio/Video Encoder (based on FFMPEG) Copyright (C) 2008-2009 Carlo Pelliccia (www.sauronsoftware.it) This program is free software:
* you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either
* version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package it.sauronsoftware.jave;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
* The default ffmpeg executable locator, which exports on disk the ffmpeg
* executable bundled with the library distributions. It should work both for
* windows and many linux distributions. If it doesn't, try compiling your own
* ffmpeg executable and plug it in JAVE with a custom {@link FFMPEGLocator}.
*
* @author Carlo Pelliccia
*/
public class DefaultFFMPEGLocator extends FFMPEGLocator {

private final static Log LOG = LogFactory.getLog(FFMPEGExecutor.class);

/**
* Trace the version of the bundled ffmpeg executable. It's a counter: every
* time the bundled ffmpeg change it is incremented by 1.
*/
private static final String MY_EXE_VERSION = "2.3";

/**
* The ffmpeg executable file path.
*/
private final String path;

/**
* It builds the default FFMPEGLocator, exporting the ffmpeg executable on a
* temp file.
*/
public DefaultFFMPEGLocator() {
String os = System.getProperty("os.name").toLowerCase();
boolean isWindows = os.contains("windows");
boolean isMac = os.contains("mac");

// Dir Folder
File dirFolder = new File(System.getProperty("java.io.tmpdir"), "jave/");
if (!dirFolder.exists())
{
dirFolder.mkdirs();
}

// -----------------ffmpeg executable export on disk.-----------------------------
String suffix = isWindows ? ".exe" : (isMac ? "-osx" : "");
String arch = System.getProperty("os.arch");

//File
File ffmpegFile = new File(dirFolder, "ffmpeg-" + arch +"-"+MY_EXE_VERSION+ suffix);
LOG.debug("Executable path: "+ffmpegFile.getAbsolutePath());

//Check the version of existing .exe file
if (ffmpegFile.exists())
{
// OK, already present
}
else
{
copyFile("ffmpeg-" + arch + suffix, ffmpegFile);
}

// Need a chmod?
if (!isWindows)
{
try
{
Runtime.getRuntime().exec(new String[]
{
"/bin/chmod", "755", ffmpegFile.getAbsolutePath()
});
} catch (IOException e)
{
LOG.error(e);
}
}

// Everything seems okay
path = ffmpegFile.getAbsolutePath();
LOG.debug("ffmpeg executable found: "+path);
}

@Override
protected String getFFMPEGExecutablePath() {
return path;
}

/**
* Copies a file bundled in the package to the supplied destination.
*
* @param path The name of the bundled file.
* @param dest The destination.
* @throws RuntimeException If an unexpected error occurs.
*/
private void copyFile(String path, File dest) {
copy(getClass().getResourceAsStream("native/" + path), dest.getAbsolutePath());
}

/**
* Copy a file from source to destination.
*
* @param source The name of the bundled file.
* @param destination the destination
* @return True if succeeded , False if not
*/
private boolean copy(InputStream source, String destination) {
boolean success = true;

try
{
Files.copy(source, Paths.get(destination), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException ex)
{
LOG.warn("Cannot write file " + destination, ex);
success = false;
}

return success;
}
}
/*
* JAVE - A Java Audio/Video Encoder (based on FFMPEG) Copyright (C) 2008-2009 Carlo Pelliccia (www.sauronsoftware.it) This program is free software:
* you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either
* version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package it.sauronsoftware.jave;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
* The default ffmpeg executable locator, which exports on disk the ffmpeg
* executable bundled with the library distributions. It should work both for
* windows and many linux distributions. If it doesn't, try compiling your own
* ffmpeg executable and plug it in JAVE with a custom {@link FFMPEGLocator}.
*
* @author Carlo Pelliccia
*/
public class DefaultFFMPEGLocator extends FFMPEGLocator {

private final static Log LOG = LogFactory.getLog(FFMPEGExecutor.class);

/**
* Trace the version of the bundled ffmpeg executable. It's a counter: every
* time the bundled ffmpeg change it is incremented by 1.
*/
private static final String MY_EXE_VERSION = "2.3.1-SNAPSHOT";

/**
* The ffmpeg executable file path.
*/
private final String path;

/**
* It builds the default FFMPEGLocator, exporting the ffmpeg executable on a
* temp file.
*/
public DefaultFFMPEGLocator() {
String os = System.getProperty("os.name").toLowerCase();
boolean isWindows = os.contains("windows");
boolean isMac = os.contains("mac");

// Dir Folder
File dirFolder = new File(System.getProperty("java.io.tmpdir"), "jave/");
if (!dirFolder.exists())
{
dirFolder.mkdirs();
}

// -----------------ffmpeg executable export on disk.-----------------------------
String suffix = isWindows ? ".exe" : (isMac ? "-osx" : "");
String arch = System.getProperty("os.arch");

//File
File ffmpegFile = new File(dirFolder, "ffmpeg-" + arch +"-"+MY_EXE_VERSION+ suffix);
LOG.debug("Executable path: "+ffmpegFile.getAbsolutePath());

//Check the version of existing .exe file
if (ffmpegFile.exists())
{
// OK, already present
}
else
{
copyFile("ffmpeg-" + arch + suffix, ffmpegFile);
}

// Need a chmod?
if (!isWindows)
{
try
{
Runtime.getRuntime().exec(new String[]
{
"/bin/chmod", "755", ffmpegFile.getAbsolutePath()
});
} catch (IOException e)
{
LOG.error(e);
}
}

// Everything seems okay
path = ffmpegFile.getAbsolutePath();
LOG.debug("ffmpeg executable found: "+path);
}

@Override
protected String getFFMPEGExecutablePath() {
return path;
}

/**
* Copies a file bundled in the package to the supplied destination.
*
* @param path The name of the bundled file.
* @param dest The destination.
* @throws RuntimeException If an unexpected error occurs.
*/
private void copyFile(String path, File dest) {
copy(getClass().getResourceAsStream("native/" + path), dest.getAbsolutePath());
}

/**
* Copy a file from source to destination.
*
* @param source The name of the bundled file.
* @param destination the destination
* @return True if succeeded , False if not
*/
private boolean copy(InputStream source, String destination) {
boolean success = true;

try
{
Files.copy(source, Paths.get(destination), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException ex)
{
LOG.warn("Cannot write file " + destination, ex);
success = false;
}

return success;
}
}
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<artifactId>jave-modules</artifactId>
<packaging>pom</packaging>
<properties>
<revision>2.3.0</revision>
<revision>2.3.1-SNAPSHOT</revision>
<!-- Don't forget to change it also in DefaultFFMPEGLocator.java -->
</properties>

<version>${revision}</version>
Expand Down

0 comments on commit ca5c6c7

Please sign in to comment.