X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Ftrgt_ffmpeg.cpp;h=57d0b9d84299114aa09fe7a5cf914a4ee92594d0;hb=6d0a3a3708d8dd5288ef1b302c36331fb005a218;hp=cf537616777cfccd0757ee6c525d4bd8c859c503;hpb=472aaef36e2037f67fb96ee8077b8e9c7e3c3446;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 cf53761..57d0b9d 100644
--- a/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
+++ b/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
@@ -90,8 +90,17 @@ ffmpeg_trgt::ffmpeg_trgt(const char *Filename,
 	buffer=NULL;
 	color_buffer=0;
 	set_remove_alpha();
-	video_codec = params.video_codec;
-	bitrate = params.bitrate;
+
+	// Set default video codec and bitrate if they weren't given.
+	if (params.video_codec == "none")
+		video_codec = "mpeg1video";
+	else
+		video_codec = params.video_codec;
+
+	if (params.bitrate == -1)
+		bitrate = 200;
+	else
+		bitrate = params.bitrate;
 }
 
 ffmpeg_trgt::~ffmpeg_trgt()
@@ -164,21 +173,21 @@ ffmpeg_trgt::init()
 	if( filename.c_str()[0] == '-' )
 		command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an"
 							" -r %f -i pipe: -loop_input"
-							//" -metadata title=\"%s\" "
-							" -vcodec %s -b %i"
+							" -metadata title=\"%s\" "
+							" -vcodec %s -b %ik"
 							" -y -- \"%s\"\n",
 							desc.get_frame_rate(),
-							//get_canvas()->get_name().c_str(),
+							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_input"
-							//" -metadata title=\"%s\" "
-							"-vcodec %s -b %i"
+							" -metadata title=\"%s\" "
+							"-vcodec %s -b %ik"
 							" -y -- \"%s\"\n",
 							desc.get_frame_rate(),
-							//get_canvas()->get_name().c_str(),
+							get_canvas()->get_name().c_str(),
 							video_codec.c_str(), bitrate,
 							filename.c_str());
 
@@ -216,18 +225,20 @@ ffmpeg_trgt::init()
 				   "ppm", "-an", "-r",
 				   strprintf("%f", desc.get_frame_rate()).c_str(),
 				   "-i", "pipe:", "-loop_input",
-				   //strprintf("-metadata title=\"%s\"", get_canvas()->get_name().c_str()).c_str(),
+				   "-metadata",
+				   strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(),
 				   "-vcodec", video_codec.c_str(),
-				   "-b "+bitrate,
+				   "-b", strprintf("%ik", bitrate).c_str(),
 				   "-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_input",
-				   //strprintf("-metadata title=\"%s\"", get_canvas()->get_name().c_str()).c_str(),
+				   "-metadata",
+				   strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(),
 				   "-vcodec", video_codec.c_str(),
-				   "-b "+bitrate,
+				   "-b", strprintf("%ik", bitrate).c_str(),
 				   "-y", filename.c_str(), (const char *)NULL);
 
 		// We should never reach here unless the exec failed