X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Fmptr_ffmpeg.cpp;h=cd3837679f0bdd215b5479c580a2867b3aa581e9;hb=aaa0275b0e9c8a981a01dad6d841c40e7d8d77c2;hp=430f95b3f8119702f3556b669eb04cac14cfd2a3;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
index 430f95b..cd38376 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** ppm Target Module
-** $Id: mptr_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file mptr_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 ===========================================================
 **
@@ -38,17 +42,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_IMPORTER_INIT(ffmpeg_mptr);
-SINFG_IMPORTER_SET_NAME(ffmpeg_mptr,"ffmpeg");
-SINFG_IMPORTER_SET_EXT(ffmpeg_mptr,"avi");
-SINFG_IMPORTER_SET_VERSION(ffmpeg_mptr,"0.1");
-SINFG_IMPORTER_SET_CVS_ID(ffmpeg_mptr,"$Id: mptr_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_IMPORTER_INIT(ffmpeg_mptr);
+SYNFIG_IMPORTER_SET_NAME(ffmpeg_mptr,"ffmpeg");
+SYNFIG_IMPORTER_SET_EXT(ffmpeg_mptr,"avi");
+SYNFIG_IMPORTER_SET_VERSION(ffmpeg_mptr,"0.1");
+SYNFIG_IMPORTER_SET_CVS_ID(ffmpeg_mptr,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -59,15 +63,15 @@ ffmpeg_mptr::seek_to(int frame)
 	{
 		if(file)
 		{
-			pclose(file);	
+			pclose(file);
 		}
 
 		string command;
-	
-		command=strprintf("ffmpeg -i \"%s\" -an -f ppmpipe -\n",filename.c_str());
-	
-		file=popen(command.c_str(),"r");
-	
+
+		command=strprintf("ffmpeg -i \"%s\" -an -f image2pipe -vcodec ppm -\n",filename.c_str());
+
+		file=popen(command.c_str(),"rb");
+
 		if(!file)
 		{
 			cerr<<"Unable to open pipe to ffmpeg"<<endl;
@@ -75,7 +79,7 @@ ffmpeg_mptr::seek_to(int frame)
 		}
 		cur_frame=-1;
 	}
-	
+
 	while(cur_frame<frame-1)
 	{
 		cerr<<"Seeking to..."<<frame<<'('<<cur_frame<<')'<<endl;
@@ -98,21 +102,21 @@ ffmpeg_mptr::grab_frame(void)
 	char cookie[2];
 	cookie[0]=fgetc(file);
 	cookie[1]=fgetc(file);
-	
+
 	if(cookie[0]!='P' || cookie[1]!='6')
 	{
 		cerr<<"stream not in PPM format \""<<cookie[0]<<cookie[1]<<'"'<<endl;
 		return false;
 	}
-	
+
 	fgetc(file);
 	fscanf(file,"%d %d\n",&w,&h);
 	fscanf(file,"%f",&divisor);
 	fgetc(file);
-			
+
 	if(feof(file))
 		return false;
-	
+
 	int x;
 	int y;
 	frame.set_wh(w,h);
@@ -138,7 +142,7 @@ ffmpeg_mptr::grab_frame(void)
 				1.0
 			);
 		}
-	cur_frame++;		
+	cur_frame++;
 	return true;
 }
 
@@ -156,14 +160,14 @@ ffmpeg_mptr::ffmpeg_mptr(const char *f)
 ffmpeg_mptr::~ffmpeg_mptr()
 {
 	if(file)
-		pclose(file);	
+		pclose(file);
 #ifdef HAVE_TERMIOS_H
 	tcsetattr(0,TCSANOW,&oldtty);
 #endif
 }
 
 bool
-ffmpeg_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCallback *)
+ffmpeg_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback *)
 {
 	int i=(int)(time*fps);
 	if(i!=cur_frame)
@@ -173,7 +177,7 @@ ffmpeg_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCallbac
 		if(!grab_frame());
 			return false;
 	}
-	
+
 	surface=frame;
 	return false;
 }