add variant of Rect::expand() that allows different amounts in each direction

[ardour.git] / gtk2_ardour / transcode_ffmpeg.cc

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 94f8527cbbe48a16b2baa077ffdcc088d5ef40cc..6b66123aaed96096075b4b143756957e3106a9fa 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -31,7 +31,7 @@
 #include "utils_videotl.h"
 #include "video_tool_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace VideoUtils;
@@ -53,9 +53,9 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
        if (!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 +96,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 +110,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 +138,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,7 +183,7 @@ 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 * (
@@ -238,6 +250,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);
@@ -298,7 +315,15 @@ TranscodeFfmpeg::format_metadata (std::string key, std::string value)
 
        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;
 }
 
@@ -391,7 +416,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;
@@ -439,7 +464,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;
@@ -470,7 +495,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());
@@ -480,17 +505,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");
@@ -498,7 +524,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;