X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Ftrgt_ffmpeg.cpp;h=c5e1cf3ff2d5c0c4a7df7f7635b8efb98b4cad15;hb=c4fa0287b0920adf20f0a0339c8668cd988b993e;hp=9ab11e4fcd60a4c58a1155d1caa75bd225afff53;hpb=50e279d84452a7292f69b11600ca4cc5420ea229;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
index 9ab11e4..c5e1cf3 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
@@ -36,6 +36,20 @@
 #include <ETL/stringf>
 #include "trgt_ffmpeg.h"
 #include <stdio.h>
+#include <sys/types.h>
+#if HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+#endif
+#if HAVE_IO_H
+ #include <io.h>
+#endif
+#if HAVE_PROCESS_H
+ #include <process.h>
+#endif
+#if HAVE_FCNTL_H
+ #include <fcntl.h>
+#endif
+#include <unistd.h>
 #include <algorithm>
 #include <functional>
 #include <ETL/clock>
@@ -48,6 +62,12 @@ using namespace synfig;
 using namespace std;
 using namespace etl;
 
+#if defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID)
+ #define UNIX_PIPE_TO_PROCESSES
+#elif defined(HAVE__SPAWNLP) && defined(HAVE__PIPE) && defined(HAVE_CWAIT)
+ #define WIN32_PIPE_TO_PROCESSES
+#endif
+
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_TARGET_INIT(ffmpeg_trgt);
@@ -60,6 +80,7 @@ SYNFIG_TARGET_SET_CVS_ID(ffmpeg_trgt,"$Id$");
 
 ffmpeg_trgt::ffmpeg_trgt(const char *Filename)
 {
+	pid=-1;
 	file=NULL;
 	filename=Filename;
 	multi_image=false;
@@ -74,7 +95,13 @@ ffmpeg_trgt::~ffmpeg_trgt()
 	{
 		etl::yield();
 		sleep(1);
-		pclose(file);
+		fclose(file);
+		int status;
+#if defined(WIN32_PIPE_TO_PROCESSES)
+		cwait(&status,pid,0);
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+		waitpid(pid,&status,0);
+#endif
 	}
 	file=NULL;
 	delete [] buffer;
@@ -125,6 +152,64 @@ ffmpeg_trgt::init()
 	if(desc.get_frame_end()-desc.get_frame_start()>0)
 		multi_image=true;
 
+#if defined(WIN32_PIPE_TO_PROCESSES)
+
+	int p[2];
+	int stdin_fileno, stdout_fileno;
+
+	if(_pipe(p, 512, O_BINARY | O_NOINHERIT) < 0) {
+		synfig::error(_("Unable to open pipe to ffmpeg"));
+		return false;
+	}
+
+	// Save stdin/stdout so we can restore them later
+	stdin_fileno  = _dup(_fileno(stdin));
+	stdout_fileno = _dup(_fileno(stdout));
+
+	// ffmpeg should read from the pipe
+	if(_dup2(p[0], _fileno(stdin)) != 0) {
+		synfig::error(_("Unable to open pipe to ffmpeg"));
+		return false;
+	}
+
+	/*
+	ffmpeg accepts the output filename on the command-line
+	if(_dup2(_fileno(output), _fileno(stdout)) != 0) {
+		synfig::error(_("Unable to open pipe to ffmpeg"));
+		return false;
+	}
+	*/
+
+	if( filename.c_str()[0] == '-' )
+		pid = _spawnlp(_P_NOWAIT, "ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", "ppm", "-an", "-r", strprintf("%f", desc.get_frame_rate()).c_str(), "-i", "pipe:", "-loop", "-hq", "-title", get_canvas()->get_name().c_str(), "-vcodec", "mpeg1video", "-y", "--", filename.c_str(), (const char *)NULL);
+	else
+		pid = _spawnlp(_P_NOWAIT, "ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", "ppm", "-an", "-r", strprintf("%f", desc.get_frame_rate()).c_str(), "-i", "pipe:", "-loop", "-hq", "-title", get_canvas()->get_name().c_str(), "-vcodec", "mpeg1video", "-y", filename.c_str(), (const char *)NULL);
+
+	if( pid < 0) {
+		synfig::error(_("Unable to open pipe to ffmpeg"));
+		return false;
+	}
+
+	// Restore stdin/stdout
+	if(_dup2(stdin_fileno, _fileno(stdin)) != 0) {
+		synfig::error(_("Unable to open pipe to ffmpeg"));
+		return false;
+	}
+	if(_dup2(stdout_fileno, _fileno(stdout)) != 0) {
+		synfig::error(_("Unable to open pipe to ffmpeg"));
+		return false;
+	}
+	close(stdin_fileno);
+	close(stdout_fileno);
+
+	// Close the pipe read end - ffmpeg uses it
+	close(p[0]);
+	
+	// We write data to the write end of the pipe
+	file = fdopen(p[1], "wb");
+
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+
 	int p[2];
   
 	if (pipe(p)) {
@@ -132,7 +217,7 @@ ffmpeg_trgt::init()
 		return false;
 	};
   
-	pid_t pid = fork();
+	pid = fork();
   
 	if (pid == -1) {
 		synfig::error(_("Unable to open pipe to ffmpeg"));
@@ -141,12 +226,19 @@ ffmpeg_trgt::init()
   
 	if (pid == 0){
 		// Child process
+		// Close pipeout, not needed
+		close(p[1]);
 		// Dup pipeout to stdin
 		if( dup2( p[0], STDIN_FILENO ) == -1 ){
 			synfig::error(_("Unable to open pipe to ffmpeg"));
 			return false;
 		}
-		execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", "ppm", "-an", "-r", strprintf("%f", desc.get_frame_rate()).c_str(), "-i", "pipe:", "-loop", "-hq", "-title", get_canvas()->get_name().c_str(), "-vcodec", "mpeg1video", "-y", "--", filename.c_str(), (const char *)NULL);
+		// Close the unneeded pipeout
+		close(p[0]);
+		if( filename.c_str()[0] == '-' )
+			execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", "ppm", "-an", "-r", strprintf("%f", desc.get_frame_rate()).c_str(), "-i", "pipe:", "-loop", "-hq", "-title", get_canvas()->get_name().c_str(), "-vcodec", "mpeg1video", "-y", "--", filename.c_str(), (const char *)NULL);
+		else
+			execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", "ppm", "-an", "-r", strprintf("%f", desc.get_frame_rate()).c_str(), "-i", "pipe:", "-loop", "-hq", "-title", get_canvas()->get_name().c_str(), "-vcodec", "mpeg1video", "-y", filename.c_str(), (const char *)NULL);
 		// We should never reach here unless the exec failed
 		synfig::error(_("Unable to open pipe to ffmpeg"));
 		return false;
@@ -158,6 +250,10 @@ ffmpeg_trgt::init()
 		file = fdopen(p[1], "wb");
 	}
 
+#else
+	#error There are no known APIs for creating child processes
+#endif
+
 	// etl::yield();
 
 	if(!file)