X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftranscode_ffmpeg.cc;h=a26c7622f5ea985bb65a3cc0e6bc434552e36166;hb=415721fa5b48f3c3dc164ac60095c095c4e48ad0;hp=efe4e44ebed259d0f7e715ffb924e6fe828a1925;hpb=94014dc5d56a5762a0cec83116255ae44ee46527;p=ardour.git

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index efe4e44ebe..a26c7622f5 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -27,11 +27,12 @@
 #include "pbd/file_utils.h"
 #include "gui_thread.h"
 
+#include "ardour/filesystem_paths.h"
+
 #include "transcode_ffmpeg.h"
 #include "utils_videotl.h"
-#include "video_tool_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace VideoUtils;
@@ -50,12 +51,12 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
 	debug_enable = false;
 #endif
 
-	if (!ArdourVideoToolPaths::transcoder_exe(ffmpeg_exe, ffprobe_exe)) {
+	if (!ARDOUR::ArdourVideoToolPaths::transcoder_exe(ffmpeg_exe, ffprobe_exe)) {
 		warning << string_compose(
 				_(
-					"No ffprobe or ffmpeg executables could be found on this system.\n"
-					"Video import and export is not possible until you install those tools.\n"
+					"ffmpeg installation was not found on this system.\n"
 					"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+					"Video import and export is not possible until you install tools.\n"
 					"\n"
 					"The tools are included with the %1 releases from ardour.org "
 					"and also available with the video-server at http://x42.github.com/harvid/\n"
@@ -96,7 +97,7 @@ TranscodeFfmpeg::probe ()
 	argp[6] = 0;
 	ffcmd = new ARDOUR::SystemExec(ffprobe_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffprobeparse, this, _1 ,_2));
-	ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this));
+	ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context());
 	if (ffcmd->start(1)) {
 		ffexit();
 		return false;
@@ -110,6 +111,7 @@ TranscodeFfmpeg::probe ()
 	int timeout = 300; // 1.5 sec
 	while (ffcmd && --timeout > 0) {
 		Glib::usleep(5000);
+		ARDOUR::GUIIdle();
 	}
 	if (timeout == 0 || ffoutput.empty()) {
 		return false;
@@ -137,9 +139,20 @@ TranscodeFfmpeg::probe ()
 		} \
 	}
 
+	std::string duration_from_format;
+
 	for (std::vector<std::vector<std::string> >::iterator i = lines.begin(); i != lines.end(); ++i) {
 		if (i->at(0) == X_("format")) {
 			/* format,filename,#streams,format-name,format-long-name,start-time,duration,size,bitrate */
+			for (std::vector<std::string>::iterator kv = i->begin(); kv != i->end(); ++kv) {
+				const size_t kvsep = kv->find('=');
+				if(kvsep == std::string::npos) continue;
+				std::string key = kv->substr(0, kvsep);
+				std::string value = kv->substr(kvsep + 1);
+				if (key == X_("duration")) {
+					duration_from_format = value;
+				}
+			}
 		} else
 		if (i->at(0) == X_("stream")) {
 			if (i->at(5) == X_("codec_type=video") && m_width == 0) {
@@ -171,10 +184,10 @@ TranscodeFfmpeg::probe ()
 						PARSE_FRACTIONAL_FPS(m_fps)
 					} else if (key == X_("time_base")) {
 						PARSE_FRACTIONAL_FPS(timebase)
-					} else if (key == X_("timecode") && m_duration == 0) {
+					} else if (key == X_("timecode") && m_duration == 0 && m_fps > 0) {
 						int h,m,s; char f[32];
 						if (sscanf(i->at(16).c_str(), "%d:%d:%d:%32s",&h,&m,&s,f) == 4) {
-							m_duration = (ARDOUR::framecnt_t) floor(m_fps * (
+							m_duration = (ARDOUR::samplecnt_t) floor(m_fps * (
 									h * 3600.0
 								+ m * 60.0
 								+ s * 1.0
@@ -238,6 +251,11 @@ TranscodeFfmpeg::probe ()
 	}
 	/* end parse */
 
+	if (m_duration == 0 && !duration_from_format.empty() && m_fps > 0) {
+		warning << "using video-duration from format (container)." << endmsg;
+		m_duration = atof(duration_from_format) * m_fps;
+	}
+
 #if 0 /* DEBUG */
 	printf("FPS: %f\n", m_fps);
 	printf("Duration: %lu frames\n",(unsigned long)m_duration);
@@ -277,38 +295,6 @@ TranscodeFfmpeg::default_meta_data ()
 	return ffm;
 }
 
-char *
-TranscodeFfmpeg::format_metadata (std::string key, std::string value)
-{
-	size_t start_pos = 0;
-	std::string v1 = value;
-	while((start_pos = v1.find_first_not_of(
-			"abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789(),.\"'",
-			start_pos)) != std::string::npos)
-	{
-		v1.replace(start_pos, 1, "_");
-		start_pos += 1;
-	}
-
-	start_pos = 0;
-	while((start_pos = v1.find("\"", start_pos)) != std::string::npos) {
-		v1.replace(start_pos, 1, "\\\"");
-		start_pos += 2;
-	}
-
-	size_t len = key.length() + v1.length() + 4;
-	char *mds = (char*) calloc(len, sizeof(char));
-#ifdef PLATFORM_WINDOWS
-	/* SystemExec::make_wargs() adds quotes around the complete argument
-	 * windows uses CreateProcess() with a parameter string
-	 * (and not an array list of separate arguments)
-	 */
-	snprintf(mds, len, "%s=%s", key.c_str(), v1.c_str());
-#else
-	snprintf(mds, len, "%s=\"%s\"", key.c_str(), v1.c_str());
-#endif
-	return mds;
-}
 
 bool
 TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf_v, TranscodeFfmpeg::FFSettings ffs, TranscodeFfmpeg::FFSettings meta, bool map)
@@ -336,7 +322,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
 	}
 	for(TranscodeFfmpeg::FFSettings::const_iterator it = meta.begin(); it != meta.end(); ++it) {
 		argp[a++] = strdup("-metadata");
-		argp[a++] = format_metadata(it->first.c_str(), it->second.c_str());
+		argp[a++] = SystemExec::format_key_value_parameter (it->first.c_str(), it->second.c_str());
 	}
 
 	if (m_fps > 0) {
@@ -399,7 +385,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
 
 	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_v, this, _1 ,_2));
-	ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this));
+	ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context());
 	if (ffcmd->start(2)) {
 		ffexit();
 		return false;
@@ -408,7 +394,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
 }
 
 bool
-TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t /*samplerate*/, unsigned int stream)
+TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::samplecnt_t /*samplerate*/, unsigned int stream)
 {
 	if (!probeok) return false;
   if (stream >= m_audio.size()) return false;
@@ -447,7 +433,7 @@ TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t /*sample
 
 	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_a, this, _1 ,_2));
-	ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this));
+	ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context());
 	if (ffcmd->start(2)) {
 		ffexit();
 		return false;
@@ -478,7 +464,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh,
 	if (bitrate < 10)  bitrate = 10;
 	if (bitrate > 1000) bitrate = 1000;
 
-	argp=(char**) calloc(15,sizeof(char*));
+	argp=(char**) calloc(16,sizeof(char*));
 	argp[0] = strdup(ffmpeg_exe.c_str());
 	argp[1] = strdup("-i");
 	argp[2] = strdup(infile.c_str());
@@ -488,17 +474,18 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh,
 	argp[6] = (char*) calloc(10,sizeof(char)); snprintf(argp[6], 10, "%ix%i", width, height);
 	argp[7] = strdup("-y");
 	argp[8] = strdup("-vcodec");
-	argp[9] = strdup("mpeg4");
+	argp[9] = strdup("mjpeg");
 	argp[10] = strdup("-an");
-	argp[11] = strdup("-keyint_min");
-	argp[12] = strdup("10");
-	argp[13] = strdup(outfile.c_str());
-	argp[14] = (char *)0;
+	argp[11] = strdup("-intra");
+	argp[12] = strdup("-g");
+	argp[13] = strdup("1");
+	argp[14] = strdup(outfile.c_str());
+	argp[15] = (char *)0;
 	/* Note: these are free()d in ~SystemExec */
 #if 1 /* DEBUG */
 	if (debug_enable) { /* tentative debug mode */
 	printf("TRANSCODE VIDEO:\n");
-	for (int i=0; i< 14; ++i) {
+	for (int i=0; i< 15; ++i) {
 	  printf("%s ", argp[i]);
 	}
 	printf("\n");
@@ -506,7 +493,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh,
 #endif
 	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_v, this, _1 ,_2));
-	ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this));
+	ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context());
 	if (ffcmd->start(2)) {
 		ffexit();
 		return false;
@@ -548,12 +535,12 @@ TranscodeFfmpeg::ffmpegparse_a (std::string d, size_t /* s */)
 {
 	const char *t;
 	int h,m,s; char f[7];
-	ARDOUR::framecnt_t p = -1;
+	ARDOUR::samplecnt_t p = -1;
 
 	if (!(t=strstr(d.c_str(), "time="))) { return; }
 
 	if (sscanf(t+5, "%d:%d:%d.%s",&h,&m,&s,f) == 4) {
-		p = (ARDOUR::framecnt_t) floor( 100.0 * (
+		p = (ARDOUR::samplecnt_t) floor( 100.0 * (
 		      h * 3600.0
 		    + m * 60.0
 		    + s * 1.0
@@ -580,10 +567,9 @@ TranscodeFfmpeg::ffmpegparse_v (std::string d, size_t /* s */)
 		  printf("ffmpeg: '%s'\n", d.c_str());
 		}
 #endif
-		Progress(0, 0); /* EMIT SIGNAL */
 		return;
 	}
-	ARDOUR::framecnt_t f = atol(d.substr(6));
+	ARDOUR::samplecnt_t f = atol(d.substr(6));
 	if (f == 0) {
 		Progress(0, 0); /* EMIT SIGNAL */
 	} else {