X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Ftrgt_ffmpeg.cpp;h=e41d1a567c25577cfa48ae2d896ba5f493b3e7e4;hb=18baf4d4fe523d84ad741d7fde0f10a58d47587b;hp=46276f64864d3d03decbdb8138576923f46a0f45;hpb=16b3beced25134bef064705568ecb893a6be4e79;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 46276f6..e41d1a5 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 @@
-/*! ========================================================================
-** Sinfg
-** 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 ===========================================================
 **
@@ -20,7 +24,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_TARGET
+#define SYNFIG_TARGET
 
 #ifdef USING_PCH
 #	include "pch.h"
@@ -40,17 +44,17 @@
 
 /* === M A C R O S ========================================================= */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_TARGET_INIT(ffmpeg_trgt);
-SINFG_TARGET_SET_NAME(ffmpeg_trgt,"ffmpeg");
-SINFG_TARGET_SET_EXT(ffmpeg_trgt,"mpg");
-SINFG_TARGET_SET_VERSION(ffmpeg_trgt,"0.1");
-SINFG_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_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$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -81,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);
@@ -108,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;
@@ -121,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)
 	{
-		sinfg::error(_("Unable to open pipe to ffmpeg"));
+		synfig::error(_("Unable to open pipe to ffmpeg"));
 		return false;
 	}
-			
+
 	return true;
 }
 
@@ -146,27 +150,27 @@ ffmpeg_trgt::end_frame()
 }
 
 bool
-ffmpeg_trgt::start_frame(sinfg::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 +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;
 }