X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftranscode_ffmpeg.cc;h=08060b6a5174e0b7e1e7aab3bc763b84d38ab770;hb=fb45fdc052b23f4b2210c71a03a14bdb5986098a;hp=5ae9ae1c20b475426673568eeab97aab4a95aeea;hpb=11ca19ed8fdd1c39537cac837fc464fa17959d59;p=ardour.git diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 5ae9ae1c20..08060b6a51 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -17,15 +17,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef WITH_VIDEOTIMELINE - #include #include #include #include #include "pbd/error.h" -#include "pbd/file_utils.h" +#include "pbd/convert.h" #include "pbd/file_utils.h" #include "gui_thread.h" @@ -34,6 +32,9 @@ #include "i18n.h" +using namespace PBD; +using namespace VideoUtils; + TranscodeFfmpeg::TranscodeFfmpeg (std::string f) : infile(f) { @@ -42,12 +43,15 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) ffmpeg_exe = ""; ffprobe_exe = ""; m_duration = 0; + m_avoffset = m_lead_in = m_lead_out = 0; + m_width = m_height = 0; + m_aspect = m_fps = 0; #if 1 /* tentative debug mode */ debug_enable = false; #endif std::string ff_file_path; - if (find_file_in_search_path (PBD::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"); } @@ -55,7 +59,7 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) ffmpeg_exe = X_("C:\\Program Files\\ffmpeg\\ffmpeg.exe"); } - if (find_file_in_search_path (PBD::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"); } @@ -64,18 +68,19 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) } if (ffmpeg_exe.empty() || ffprobe_exe.empty()) { - PBD::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; @@ -111,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 > lines; @@ -127,10 +144,10 @@ TranscodeFfmpeg::probe () #define PARSE_FRACTIONAL_FPS(VAR) \ { \ std::string::size_type pos; \ - VAR = atof(value.c_str()); \ + VAR = atof(value); \ pos = value.find_first_of('/'); \ if (pos != std::string::npos) { \ - VAR = atof(value.substr(0, pos).c_str()) / atof(value.substr(pos+1).c_str()); \ + VAR = atof(value.substr(0, pos)) / atof(value.substr(pos+1)); \ } \ } @@ -147,10 +164,12 @@ TranscodeFfmpeg::probe () std::string key = kv->substr(0, kvsep); std::string value = kv->substr(kvsep + 1); - if (key == X_("width")) { - m_width = atoi(value.c_str()); + if (key == X_("index")) { + m_videoidx = atoi(value); + } else if (key == X_("width")) { + m_width = atoi(value); } else if (key == X_("height")) { - m_height = atoi(value.c_str()); + m_height = atoi(value); } else if (key == X_("codec_name")) { if (!m_codec.empty()) m_codec += " "; m_codec += value; @@ -177,14 +196,14 @@ TranscodeFfmpeg::probe () )); } } else if (key == X_("duration_ts") && m_fps == 0 && timebase !=0 ) { - m_duration = atof(value.c_str()) * m_fps * timebase; + m_duration = atof(value) * m_fps * timebase; } else if (key == X_("duration") && m_fps != 0 && m_duration == 0) { - m_duration = atof(value.c_str()) * m_fps; + m_duration = atof(value) * m_fps; } else if (key == X_("display_aspect_ratio")) { std::string::size_type pos; pos = value.find_first_of(':'); - if (pos != std::string::npos && atof(value.substr(pos+1).c_str()) != 0) { - m_aspect = atof(value.substr(0, pos).c_str()) / atof(value.substr(pos+1).c_str()); + if (pos != std::string::npos && atof(value.substr(pos+1)) != 0) { + m_aspect = atof(value.substr(0, pos)) / atof(value.substr(pos+1)); } } } @@ -194,7 +213,7 @@ TranscodeFfmpeg::probe () } } else if (i->at(5) == X_("codec_type=audio")) { /* new ffprobe */ - AudioStream as; + FFAudioStream as; for (std::vector::iterator kv = i->begin(); kv != i->end(); ++kv) { const size_t kvsep = kv->find('='); if(kvsep == std::string::npos) continue; @@ -202,7 +221,7 @@ TranscodeFfmpeg::probe () std::string value = kv->substr(kvsep + 1); if (key == X_("channels")) { - as.channels = atoi(value.c_str()); + as.channels = atoi(value); } else if (key == X_("index")) { as.stream_id = value; } else if (key == X_("codec_long_name")) { @@ -226,12 +245,7 @@ TranscodeFfmpeg::probe () } /* end parse */ - - int timeout = 500; - while (ffcmd && --timeout) usleep (1000); // wait until 'ffprobe' terminated. - if (timeout == 0) return false; - -#if 1 /* DEBUG */ +#if 0 /* DEBUG */ printf("FPS: %f\n", m_fps); printf("Duration: %lu frames\n",(unsigned long)m_duration); printf("W/H: %ix%i\n",m_width, m_height); @@ -249,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"; @@ -261,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; @@ -296,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; @@ -314,20 +328,45 @@ 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()); } + if (m_lead_in != 0 && m_lead_out != 0) { + std::ostringstream osstream; + argp[a++] = strdup("-vf"); + osstream << X_("color=c=black:s=") << m_width << X_("x") << m_height << X_(":d=") << m_lead_in << X_(" [pre]; "); + osstream << X_("color=c=black:s=") << m_width << X_("x") << m_height << X_(":d=") << m_lead_out << X_(" [post]; "); + osstream << X_("[pre] [in] [post] concat=n=3"); + argp[a++] = strdup(osstream.str().c_str()); + } else if (m_lead_in != 0) { + std::ostringstream osstream; + argp[a++] = strdup("-vf"); + osstream << X_("color=c=black:s=") << m_width << X_("x") << m_height << X_(":d=") << m_lead_in << X_(" [pre]; "); + osstream << X_("[pre] [in] concat=n=2"); + argp[a++] = strdup(osstream.str().c_str()); + } else if (m_lead_out != 0) { + std::ostringstream osstream; + argp[a++] = strdup("-vf"); + osstream << X_("color=c=black:s=") << m_width << X_("x") << m_height << X_(":d=") << m_lead_out << X_(" [post]; "); + osstream << X_("[in] [post] concat=n=2"); + argp[a++] = strdup(osstream.str().c_str()); + } + if (map) { + std::ostringstream osstream; argp[a++] = strdup("-map"); - argp[a++] = strdup("0:0"); + osstream << X_("0:") << m_videoidx; + argp[a++] = strdup(osstream.str().c_str()); argp[a++] = strdup("-map"); argp[a++] = strdup("1:0"); } + argp[a++] = strdup("-y"); argp[a++] = strdup(outfile.c_str()); argp[a] = (char *)0; @@ -354,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; @@ -366,7 +405,7 @@ TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t samplera argp[i++] = strdup(ffmpeg_exe.c_str()); argp[i++] = strdup("-i"); argp[i++] = strdup(infile.c_str()); -#if 0 // native samplerate -- use a3/SRC +#if 0 /* ffmpeg write original samplerate, use a3/SRC to resample */ argp[i++] = strdup("-ar"); argp[i] = (char*) calloc(7,sizeof(char)); snprintf(argp[i++], 7, "%"PRId64, samplerate); #endif @@ -466,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(); } @@ -514,7 +557,7 @@ void TranscodeFfmpeg::ffmpegparse_v (std::string d, size_t /* s */) { if (strstr(d.c_str(), "ERROR") || strstr(d.c_str(), "Error") || strstr(d.c_str(), "error")) { - PBD::warning << "ffmpeg-error: " << d << endmsg; + warning << "ffmpeg-error: " << d << endmsg; } if (strncmp(d.c_str(), "frame=",6)) { #if 1 /* DEBUG */ @@ -523,10 +566,13 @@ 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).c_str()); - Progress(f, m_duration); /* EMIT SIGNAL */ + ARDOUR::framecnt_t f = atol(d.substr(6)); + if (f == 0) { + Progress(0, 0); /* EMIT SIGNAL */ + } else { + Progress(f, m_duration); /* EMIT SIGNAL */ + } } - -#endif /* WITH_VIDEOTIMELINE */