X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Fmptr_ffmpeg.cpp;h=f837c7bd83c8d5b82d30b4f2b02fc0a5de1dce34;hb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;hp=827a5278b0abdf84082e22642caadb818025b74d;hpb=991d45b68d8b19c075e5b16bb63b6b8898090341;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 827a527..f837c7b 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -62,7 +63,7 @@ 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)
+#else
  #define WIN32_PIPE_TO_PROCESSES
 #endif
 
@@ -76,6 +77,11 @@ SYNFIG_IMPORTER_SET_CVS_ID(ffmpeg_mptr,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
+bool ffmpeg_mptr::is_animated()
+{
+	return true;
+}
+
 bool
 ffmpeg_mptr::seek_to(int frame)
 {
@@ -83,83 +89,39 @@ ffmpeg_mptr::seek_to(int frame)
 	{
 		if(file)
 		{
-			fclose(file);
-			int status;
 #if defined(WIN32_PIPE_TO_PROCESSES)
-		cwait(&status,pid,0);
+			pclose(file);
 #elif defined(UNIX_PIPE_TO_PROCESSES)
-		waitpid(pid,&status,0);
+			fclose(file);
+			int status;
+			waitpid(pid,&status,0);
 #endif
 		}
 
 #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));
-
-	// ffmpeg should write to the pipe
-	if(_dup2(p[1], _fileno(stdout)) != 0) {
-		cerr<<"Unable to open pipe to ffmpeg"<<endl;
-		return false;
-	}
-
-	/*
-	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;
-	}
+		string command;
 
-	// 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);
+		command=strprintf("ffmpeg -ss 00:00:00.%d -i \"%s\" -an -f image2pipe -vcodec ppm -\n",frame,filename.c_str());
 
-	// 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");
+		file=popen(command.c_str(),POPEN_BINARY_READ_TYPE);
 
 #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
@@ -171,10 +133,11 @@ ffmpeg_mptr::seek_to(int frame)
 			}
 			// Close the unneeded pipein
 			close(p[1]);
-			execlp("ffmpeg", "ffmpeg", "-i", filename.c_str(), "-an", "-f", "image2pipe", "-vcodec", "ppm", "-", (const char *)NULL);
+			string time = strprintf("00:00:00.%d",frame);
+			execlp("ffmpeg", "ffmpeg", "-ss", time.c_str(), "-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;
+			_exit(1);
 		} else {
 			// Parent process
 			// Close pipeout, not needed
@@ -216,6 +179,10 @@ ffmpeg_mptr::grab_frame(void)
 	float divisor;
 	char cookie[2];
 	cookie[0]=fgetc(file);
+
+	if(feof(file))
+		return false;
+
 	cookie[1]=fgetc(file);
 
 	if(cookie[0]!='P' || cookie[1]!='6')
@@ -277,11 +244,11 @@ ffmpeg_mptr::~ffmpeg_mptr()
 {
 	if(file)
 	{
-		fclose(file);
-		int status;
 #if defined(WIN32_PIPE_TO_PROCESSES)
-		cwait(&status,pid,0);
+		pclose(file);
 #elif defined(UNIX_PIPE_TO_PROCESSES)
+		fclose(file);
+		int status;
 		waitpid(pid,&status,0);
 #endif
 	}
@@ -298,10 +265,10 @@ 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;
 	}
 
 	surface=frame;
-	return false;
+	return true;
 }