Fix 1818856: External application render targets seem to be broken. We can't use...

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

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 21dcfb4..e41d1a5 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
@@ -1,8 +1,10 @@
-/*! ========================================================================
-** 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
 **
+**     $Id$
+**
+**     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
 **     This package is free software; you can redistribute it and/or
@@ -14,6 +16,7 @@
 **     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 ===========================================================
 **
@@ -51,7 +54,7 @@ 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 ======================================================= */
 
@@ -82,7 +85,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);
@@ -109,7 +112,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;
@@ -122,19 +125,19 @@ ffmpeg_trgt::init()
        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");
-       
+
+       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());
+
+       file=popen(command.c_str(),POPEN_BINARY_WRITE_TYPE);
+
        // etl::yield();
-       
+
        if(!file)
        {
                synfig::error(_("Unable to open pipe to ffmpeg"));
                return false;
        }
-                       
+
        return true;
 }
 
@@ -147,27 +150,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;
 }
@@ -177,11 +180,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;
 }