X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Ftrgt_ffmpeg.cpp;h=0f2a728492ce79f5d59bbcd809938ababba85742;hb=6202fa9106fb2e71a2684094cb534eda9588fadd;hp=5b5b2bc77b5b3cb12b0247d4cde18d5f6d800752;hpb=f852a18220423ff5adb69a833601d5a6fb29bdb8;p=synfig.git

diff --git a/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp b/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
index 5b5b2bc..0f2a728 100644
--- a/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
+++ b/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2010 Diego Barrios Romero
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -79,7 +80,8 @@ SYNFIG_TARGET_SET_CVS_ID(ffmpeg_trgt,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
-ffmpeg_trgt::ffmpeg_trgt(const char *Filename)
+ffmpeg_trgt::ffmpeg_trgt(const char *Filename,
+						 const synfig::TargetParam& params)
 {
 	pid=-1;
 	file=NULL;
@@ -88,6 +90,8 @@ ffmpeg_trgt::ffmpeg_trgt(const char *Filename)
 	buffer=NULL;
 	color_buffer=0;
 	set_remove_alpha();
+	video_codec = params.video_codec;
+	bitrate = params.bitrate;
 }
 
 ffmpeg_trgt::~ffmpeg_trgt()
@@ -158,9 +162,23 @@ ffmpeg_trgt::init()
 	string command;
 
 	if( filename.c_str()[0] == '-' )
-			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());
+		command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an"
+							" -r %f -i pipe: -loop -hq"
+							" -title \"%s\" -vcodec %s -b %i"
+							" -y -- \"%s\"\n",
+							desc.get_frame_rate(),
+							get_canvas()->get_name().c_str(),
+							video_codec.c_str(), bitrate,
+							filename.c_str());
 	else
-			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());
+		command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an"
+							" -r %f -i pipe: -loop -hq"
+							" -title \"%s\" -vcodec %s -b %i"
+							" -y -- \"%s\"\n",
+							desc.get_frame_rate(),
+							get_canvas()->get_name().c_str(),
+							video_codec.c_str(), bitrate,
+							filename.c_str());
 
 	file=popen(command.c_str(),POPEN_BINARY_WRITE_TYPE);
 
@@ -192,9 +210,24 @@ ffmpeg_trgt::init()
 		// 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);
+			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", video_codec.c_str(),
+				   "-b", bitrate,
+				   "-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);
+			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", video_codec.c_str(),
+				   "-b", bitrate,
+				   "-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;