Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_ffmpeg / mptr_ffmpeg.cpp

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 f1f7e0b..f837c7b 100644 (file)
--- 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
@@ -35,7 +36,18 @@
 #include "mptr_ffmpeg.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/wait.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>
@@ -49,6 +61,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
+#else
+ #define WIN32_PIPE_TO_PROCESSES
+#endif
+
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_IMPORTER_INIT(ffmpeg_mptr);
@@ -59,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)
 {
@@ -66,25 +89,39 @@ ffmpeg_mptr::seek_to(int frame)
        {
                if(file)
                {
+#if defined(WIN32_PIPE_TO_PROCESSES)
+                       pclose(file);
+#elif defined(UNIX_PIPE_TO_PROCESSES)
                        fclose(file);
                        int status;
                        waitpid(pid,&status,0);
+#endif
                }
 
+#if defined(WIN32_PIPE_TO_PROCESSES)
+
+               string command;
+
+               command=strprintf("ffmpeg -ss 00:00:00.%d -i \"%s\" -an -f image2pipe -vcodec ppm -\n",frame,filename.c_str());
+
+               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
@@ -96,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
@@ -108,6 +146,10 @@ ffmpeg_mptr::seek_to(int frame)
                        file = fdopen(p[0], "rb");
                }
 
+#else
+       #error There are no known APIs for creating child processes
+#endif
+
                if(!file)
                {
                        cerr<<"Unable to open pipe to ffmpeg"<<endl;
@@ -137,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')
@@ -198,9 +244,13 @@ ffmpeg_mptr::~ffmpeg_mptr()
 {
        if(file)
        {
+#if defined(WIN32_PIPE_TO_PROCESSES)
+               pclose(file);
+#elif defined(UNIX_PIPE_TO_PROCESSES)
                fclose(file);
                int status;
                waitpid(pid,&status,0);
+#endif
        }
 #ifdef HAVE_TERMIOS_H
        tcsetattr(0,TCSANOW,&oldtty);
@@ -215,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;
 }