X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftranscode_ffmpeg.cc;h=6b66123aaed96096075b4b143756957e3106a9fa;hb=04c484089c5f1ff064b111ce3e4f1e2ff7e7ec83;hp=4a0fc4b342670025f35ca4afb73d794523fa42c6;hpb=01c6266909bc7b1dce27a4d58d46be17f76c3f76;p=ardour.git diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 4a0fc4b342..6b66123aae 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -29,8 +29,9 @@ #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; @@ -40,8 +41,6 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) { probeok = false; ffexecok = false; - ffmpeg_exe = ""; - ffprobe_exe = ""; m_duration = 0; m_avoffset = m_lead_in = m_lead_out = 0; m_width = m_height = 0; @@ -51,37 +50,22 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) debug_enable = false; #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; } - 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"); - } - else if (Glib::file_test(X_("C:\\Program Files\\ffmpeg\\ffmpeg.exe"), Glib::FILE_TEST_EXISTS)) { - 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; } - 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"); - } - else if (Glib::file_test(X_("C:\\Program Files\\ffmpeg\\ffprobe.exe"), Glib::FILE_TEST_EXISTS)) { - ffprobe_exe = X_("C:\\Program Files\\ffmpeg\\ffprobe.exe"); - } - - if (ffmpeg_exe.empty() || ffprobe_exe.empty()) { + 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" - "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\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" - "\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" - ), PROGRAM_NAME) << endmsg; + "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" + "\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" + "\n" + "see also http://manual.ardour.org/video-timeline/setup/" + ), PROGRAM_NAME) << endmsg; return; } ffexecok = true; @@ -112,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; @@ -126,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; @@ -153,9 +138,20 @@ TranscodeFfmpeg::probe () } \ } + std::string duration_from_format; + for (std::vector >::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::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) { @@ -187,9 +183,9 @@ 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) { - int h,m,s; char f[7]; - if (sscanf(i->at(16).c_str(), "%d:%d:%d:%s",&h,&m,&s,f) == 4) { + } 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 * ( h * 3600.0 + m * 60.0 @@ -254,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); @@ -289,7 +290,7 @@ TranscodeFfmpeg::default_meta_data () { TranscodeFfmpeg::FFSettings ffm; ffm.clear(); - ffm["comment"] = "Created with ardour"; + ffm["comment"] = "Created with " PROGRAM_NAME; return ffm; } @@ -314,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; } @@ -346,6 +355,12 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf argp[a++] = strdup("-metadata"); argp[a++] = format_metadata(it->first.c_str(), it->second.c_str()); } + + if (m_fps > 0) { + m_lead_in = rint (m_lead_in * m_fps) / m_fps; + m_lead_out = rint (m_lead_out * m_fps) / m_fps; + } + if (m_lead_in != 0 && m_lead_out != 0) { std::ostringstream osstream; argp[a++] = strdup("-vf"); @@ -401,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; @@ -449,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; @@ -509,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;