merge with master, fixing conflicts in 3 wscript files

[ardour.git] / gtk2_ardour / transcode_ffmpeg.cc

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 56c55ff4eec216cf657d122ee5cc8ca12c2fc148..08060b6a5174e0b7e1e7aab3bc763b84d38ab770 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -33,6 +33,7 @@
 #include "i18n.h"
 
 using namespace PBD;
+using namespace VideoUtils;
 
 TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
        : infile(f)
@@ -50,7 +51,7 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
 #endif
 
        std::string ff_file_path;
-       if (find_file_in_search_path (SearchPath(Glib::getenv("PATH")), X_("ffmpeg_harvid"), ff_file_path)) { ffmpeg_exe = ff_file_path; }
+       if (find_file_in_search_path (Searchpath(Glib::getenv("PATH")), X_("ffmpeg_harvid"), ff_file_path)) { ffmpeg_exe = ff_file_path; }
        else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffmpeg.exe"), Glib::FILE_TEST_EXISTS)) {
                ffmpeg_exe = X_("C:\\Program Files\\ffmpeg\\ffmpeg.exe");
        }
@@ -58,7 +59,7 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
                ffmpeg_exe = X_("C:\\Program Files\\ffmpeg\\ffmpeg.exe");
        }
 
-       if (find_file_in_search_path (SearchPath(Glib::getenv("PATH")), X_("ffprobe_harvid"), ff_file_path)) { ffprobe_exe = ff_file_path; }
+       if (find_file_in_search_path (Searchpath(Glib::getenv("PATH")), X_("ffprobe_harvid"), ff_file_path)) { ffprobe_exe = ff_file_path; }
        else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffprobe.exe"), Glib::FILE_TEST_EXISTS)) {
                ffprobe_exe = X_("C:\\Program Files\\ffmpeg\\ffprobe.exe");
        }
@@ -67,18 +68,19 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
        }
 
        if (ffmpeg_exe.empty() || ffprobe_exe.empty()) {
-               warning << _(
+               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"
-                               "Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+                               "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
                                "\n"
-                               "The tools are included with the Ardour releases from ardour.org "
+                               "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"
                                "\n"
                                "Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n"
                                "If you already have a suitable ffmpeg installation on your system, we recommend creating "
                                "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
-                               ) << endmsg;
+                               ), PROGRAM_NAME) << endmsg;
                return;
        }
        ffexecok = true;
@@ -114,8 +116,20 @@ TranscodeFfmpeg::probe ()
                ffexit();
                return false;
        }
+
+       /* wait for ffprobe process to exit */
        ffcmd->wait();
 
+       /* wait for interposer thread to copy all data.
+        * SystemExec::Terminated is emitted and ffcmd set to NULL */
+       int timeout = 300; // 1.5 sec
+       while (ffcmd && --timeout > 0) {
+               Glib::usleep(5000);
+       }
+       if (timeout == 0 || ffoutput.empty()) {
+               return false;
+       }
+
        /* parse */
 
        std::vector<std::vector<std::string> > lines;
@@ -199,7 +213,7 @@ TranscodeFfmpeg::probe ()
                                }
 
                        } else if (i->at(5) == X_("codec_type=audio")) { /* new ffprobe */
-                               AudioStream as;
+                               FFAudioStream as;
                                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;
@@ -231,11 +245,6 @@ TranscodeFfmpeg::probe ()
        }
        /* end parse */
 
-
-       int timeout = 500;
-       while (ffcmd && --timeout) usleep (1000); // wait until 'ffprobe' terminated.
-       if (timeout == 0) return false;
-
 #if 0 /* DEBUG */
        printf("FPS: %f\n", m_fps);
        printf("Duration: %lu frames\n",(unsigned long)m_duration);
@@ -254,10 +263,10 @@ TranscodeFfmpeg::probe ()
        return true;
 }
 
-FFSettings
+TranscodeFfmpeg::FFSettings
 TranscodeFfmpeg::default_encoder_settings ()
 {
-       FFSettings ffs;
+       TranscodeFfmpeg::FFSettings ffs;
        ffs.clear();
        ffs["-vcodec"] = "mpeg4";
        ffs["-acodec"] = "ac3";
@@ -266,10 +275,10 @@ TranscodeFfmpeg::default_encoder_settings ()
        return ffs;
 }
 
-FFSettings
+TranscodeFfmpeg::FFSettings
 TranscodeFfmpeg::default_meta_data ()
 {
-       FFSettings ffm;
+       TranscodeFfmpeg::FFSettings ffm;
        ffm.clear();
        ffm["comment"] = "Created with ardour";
        return ffm;
@@ -301,7 +310,7 @@ TranscodeFfmpeg::format_metadata (std::string key, std::string value)
 }
 
 bool
-TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf_v, FFSettings ffs, FFSettings meta, bool map)
+TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf_v, TranscodeFfmpeg::FFSettings ffs, TranscodeFfmpeg::FFSettings meta, bool map)
 {
 #define MAX_FFMPEG_ENCODER_ARGS (100)
        char **argp;
@@ -320,11 +329,11 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
        argp[a++] = strdup("-i");
        argp[a++] = strdup(inf_a.c_str());
 
-       for(FFSettings::const_iterator it = ffs.begin(); it != ffs.end(); ++it) {
+       for(TranscodeFfmpeg::FFSettings::const_iterator it = ffs.begin(); it != ffs.end(); ++it) {
                argp[a++] = strdup(it->first.c_str());
                argp[a++] = strdup(it->second.c_str());
        }
-       for(FFSettings::const_iterator it = meta.begin(); it != meta.end(); ++it) {
+       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());
        }
@@ -384,7 +393,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::framecnt_t /*samplerate*/, unsigned int stream)
 {
        if (!probeok) return false;
   if (stream >= m_audio.size()) return false;
@@ -464,7 +473,7 @@ 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("-intra");
        argp[12] = strdup("-g");
@@ -496,7 +505,11 @@ TranscodeFfmpeg::cancel ()
 {
        if (!ffcmd || !ffcmd->is_running()) { return;}
        ffcmd->write_to_stdin("q");
+#ifdef WIN32
+       Sleep(1000);
+#else
        sleep (1);
+#endif
        if (ffcmd) {
          ffcmd->terminate();
        }