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=c3bce7061b8edc9b05f2ee7b9184cc3a21238915;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;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 c3bce70..c5e1cf3 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp @@ -1,18 +1,22 @@ -/*! ======================================================================== -** Synfig -** ppm Target Module -** $Id: trgt_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +/* === S Y N F I G ========================================================= */ +/*! \file trgt_ffmpeg.cpp +** \brief ppm Target Module ** -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** $Id$ ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal ** ** === N O T E S =========================================================== ** @@ -32,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 @@ -44,18 +62,25 @@ 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); SYNFIG_TARGET_SET_NAME(ffmpeg_trgt,"ffmpeg"); SYNFIG_TARGET_SET_EXT(ffmpeg_trgt,"mpg"); SYNFIG_TARGET_SET_VERSION(ffmpeg_trgt,"0.1"); -SYNFIG_TARGET_SET_CVS_ID(ffmpeg_trgt,"$Id: trgt_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_TARGET_SET_CVS_ID(ffmpeg_trgt,"$Id$"); /* === M E T H O D S ======================================================= */ ffmpeg_trgt::ffmpeg_trgt(const char *Filename) { + pid=-1; file=NULL; filename=Filename; multi_image=false; @@ -70,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; @@ -81,7 +112,7 @@ bool ffmpeg_trgt::set_rend_desc(RendDesc *given_desc) { //given_desc->set_pixel_format(PF_RGB); - + // Make sure that the width and height // are multiples of 8 given_desc->set_w((given_desc->get_w()+4)/8*8); @@ -108,7 +139,7 @@ ffmpeg_trgt::set_rend_desc(RendDesc *given_desc) if(fps>=59.94) given_desc->set_frame_rate(59.94); */ - + desc=*given_desc; return true; @@ -120,20 +151,117 @@ 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 imagepipe -an -r %f -i pipe: -loop -hq -title \"%s\" -y \"%s\"\n",desc.get_frame_rate(),get_canvas()->get_name().c_str(),filename.c_str()); - - file=popen(command.c_str(),"w"); + +#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)) { + 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(); - + if(!file) { synfig::error(_("Unable to open pipe to ffmpeg")); return false; } - + return true; } @@ -146,27 +274,27 @@ 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(); - + if(!file) return false; - + fprintf(file, "P6\n"); fprintf(file, "%d %d\n", w, h); - fprintf(file, "%d\n", 255); - + fprintf(file, "%d\n", 255); + delete [] buffer; buffer=new unsigned char[3*w]; delete [] color_buffer; color_buffer=new Color[w]; - + return true; } Color * -ffmpeg_trgt::start_scanline(int scanline) +ffmpeg_trgt::start_scanline(int /*scanline*/) { return color_buffer; } @@ -176,11 +304,11 @@ ffmpeg_trgt::end_scanline() { if(!file) return false; - + convert_color_format(buffer, color_buffer, desc.get_w(), PF_RGB, gamma()); if(!fwrite(buffer,1,desc.get_w()*3,file)) return false; - + return true; }