X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Ftrgt_ffmpeg.cpp;h=c5e1cf3ff2d5c0c4a7df7f7635b8efb98b4cad15;hb=991d45b68d8b19c075e5b16bb63b6b8898090341;hp=02fd92aaef39a59d1c63e7ea02896c2c616c54a0;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;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 02fd92a..c5e1cf3 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp @@ -2,6 +2,8 @@ /*! \file trgt_ffmpeg.cpp ** \brief ppm Target Module ** +** $Id$ +** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** @@ -34,6 +36,20 @@ #include #include "trgt_ffmpeg.h" #include +#include +#if HAVE_SYS_WAIT_H + #include +#endif +#if HAVE_IO_H + #include +#endif +#if HAVE_PROCESS_H + #include +#endif +#if HAVE_FCNTL_H + #include +#endif +#include #include #include #include @@ -46,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); @@ -58,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; @@ -72,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; @@ -122,11 +151,108 @@ ffmpeg_trgt::init() imagecount=desc.get_frame_start(); if(desc.get_frame_end()-desc.get_frame_start()>0) multi_image=true; - string command; - command=strprintf("ffmpeg -f image2pipe -vcodec ppm -an -r %f -i pipe: -loop -hq -title \"%s\" -vcodec mpeg1video -y \"%s\"\n",desc.get_frame_rate(),get_canvas()->get_name().c_str(),filename.c_str()); +#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); - file=popen(command.c_str(),"w"); + 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)) { + synfig::error(_("Unable to open pipe to ffmpeg")); + return false; + }; + + pid = fork(); + + if (pid == -1) { + synfig::error(_("Unable to open pipe to ffmpeg")); + return false; + } + + 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; + } + // 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; + } else { + // Parent process + // Close pipein, not needed + close(p[0]); + // Save pipeout to file handle, will write to it later + file = fdopen(p[1], "wb"); + } + +#else + #error There are no known APIs for creating child processes +#endif // etl::yield(); @@ -148,7 +274,7 @@ ffmpeg_trgt::end_frame() } bool -ffmpeg_trgt::start_frame(synfig::ProgressCallback *callback) +ffmpeg_trgt::start_frame(synfig::ProgressCallback */*callback*/) { int w=desc.get_w(),h=desc.get_h(); @@ -168,7 +294,7 @@ ffmpeg_trgt::start_frame(synfig::ProgressCallback *callback) } Color * -ffmpeg_trgt::start_scanline(int scanline) +ffmpeg_trgt::start_scanline(int /*scanline*/) { return color_buffer; }