X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Fmptr_ffmpeg.cpp;h=12fa556b58af381fb9304626027a5d3d4fdf2597;hb=48bbcdc963c394122d294519d43330e046433129;hp=bc4cc7b0b1db4257380e34fb478c44c8f97c64ea;hpb=9698bd80061a79c7f9e6940d2cfba7d34cd4c120;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
index bc4cc7b..12fa556 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -34,6 +34,20 @@
 #include <ETL/stringf>
 #include "mptr_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 <iostream>
 #include <algorithm>
 #include <functional>
@@ -46,6 +60,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_IMPORTER_INIT(ffmpeg_mptr);
@@ -63,14 +83,109 @@ ffmpeg_mptr::seek_to(int frame)
 	{
 		if(file)
 		{
-			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
 		}
 
-		string command;
+#if defined(WIN32_PIPE_TO_PROCESSES)
+
+	int p[2];
+	int stdin_fileno, stdout_fileno;
+
+	if(_pipe(p, 512, O_BINARY | O_NOINHERIT) < 0) {
+		cerr<<"Unable to open pipe to ffmpeg"<<endl;
+		return false;
+	}
+
+	// Save stdin/stdout so we can restore them later
+	stdin_fileno  = _dup(_fileno(stdin));
+	stdout_fileno = _dup(_fileno(stdout));
 
-		command=strprintf("ffmpeg -i \"%s\" -an -f image2pipe -vcodec ppm -\n",filename.c_str());
+	// ffmpeg should write to the pipe
+	if(_dup2(p[1], _fileno(stdout)) != 0) {
+		cerr<<"Unable to open pipe to ffmpeg"<<endl;
+		return false;
+	}
 
-		file=popen(command.c_str(),POPEN_BINARY_READ_TYPE);
+	/*
+	ffmpeg accepts the input filename on the command-line
+	if(_dup2(_fileno(input), _fileno(stdin)) != 0) {
+		synfig::error(_("Unable to open pipe to ffmpeg"));
+		return false;
+	}
+	*/
+
+	pid = _spawnlp(_P_NOWAIT, "ffmpeg", "ffmpeg", "-i", filename.c_str(), "-an", "-f", "image2pipe", "-vcodec", "ppm", "-", (const char *)NULL);
+	if( pid < 0) {
+		cerr<<"Unable to open pipe to ffmpeg"<<endl;
+		return false;
+	}
+
+	// Restore stdin/stdout
+	if(_dup2(stdin_fileno, _fileno(stdin)) != 0) {
+		cerr<<"Unable to open pipe to ffmpeg"<<endl;
+		return false;
+	}
+	if(_dup2(stdout_fileno, _fileno(stdout)) != 0) {
+		cerr<<"Unable to open pipe to ffmpeg"<<endl;
+		return false;
+	}
+	close(stdin_fileno);
+	close(stdout_fileno);
+
+	// Close the pipe write end - ffmpeg uses it
+	close(p[1]);
+	
+	// We read data from the read end of the pipe
+	file = fdopen(p[0], "rb");
+
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+
+		int p[2];
+	  
+		if (pipe(p)) {
+			cerr<<"Unable to open pipe to ffmpeg"<<endl;
+			return false;
+		};
+	  
+		pid = fork();
+	  
+		if (pid == -1) {
+			cerr<<"Unable to open pipe to ffmpeg"<<endl;
+			return false;
+		}
+	  
+		if (pid == 0){
+			// Child process
+			// Close pipein, not needed
+			close(p[0]);
+			// Dup pipein to stdout
+			if( dup2( p[1], STDOUT_FILENO ) == -1 ){
+				cerr<<"Unable to open pipe to ffmpeg"<<endl;
+				return false;
+			}
+			// Close the unneeded pipein
+			close(p[1]);
+			execlp("ffmpeg", "ffmpeg", "-i", filename.c_str(), "-an", "-f", "image2pipe", "-vcodec", "ppm", "-", (const char *)NULL);
+			// We should never reach here unless the exec failed
+			cerr<<"Unable to open pipe to ffmpeg"<<endl;
+			return false;
+		} else {
+			// Parent process
+			// Close pipeout, not needed
+			close(p[1]);
+			// Save pipein to file handle, will read from it later
+			file = fdopen(p[0], "rb");
+		}
+
+#else
+	#error There are no known APIs for creating child processes
+#endif
 
 		if(!file)
 		{
@@ -148,6 +263,7 @@ ffmpeg_mptr::grab_frame(void)
 
 ffmpeg_mptr::ffmpeg_mptr(const char *f)
 {
+	pid=-1;
 #ifdef HAVE_TERMIOS_H
 	tcgetattr (0, &oldtty);
 #endif
@@ -160,7 +276,15 @@ ffmpeg_mptr::ffmpeg_mptr(const char *f)
 ffmpeg_mptr::~ffmpeg_mptr()
 {
 	if(file)
-		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
+	}
 #ifdef HAVE_TERMIOS_H
 	tcsetattr(0,TCSANOW,&oldtty);
 #endif
@@ -174,7 +298,7 @@ ffmpeg_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallb
 	{
 		if(!seek_to(i))
 			return false;
-		if(!grab_frame());
+		if(!grab_frame())
 			return false;
 	}