X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.cc;h=f16aea8dfae05bae15e488383ac77ec48802953b;hb=63a4cc9cf6e02153a6c647867abfec6b013e0708;hp=0eeed4a29a8e66916f8c570fe11f43817988b0ef;hpb=3a7652200d5383c1be4e83cd59e9fb5be1521a24;p=ardour.git diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 0eeed4a29a..f16aea8dfa 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -22,27 +22,23 @@ #include "ardour/tempo.h" #include "pbd/file_utils.h" -#include "pbd/convert.h" +#include "pbd/types_convert.h" #include "ardour/session_directory.h" -#ifdef PLATFORM_WINDOWS -#include -#include // CSIDL_* -#include "pbd/windows_special_dirs.h" -#endif - #include "ardour_ui.h" +#include "ardour_http.h" #include "public_editor.h" #include "gui_thread.h" #include "utils_videotl.h" #include "rgb_macros.h" #include "video_timeline.h" +#include "video_tool_paths.h" #include #include #include -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -52,8 +48,8 @@ using namespace VideoUtils; VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, int initial_height) : editor (ed) - , videotl_group(vbg) - , bar_height(initial_height) + , videotl_group(vbg) + , bar_height(initial_height) { video_start_offset = 0L; video_offset = 0L; @@ -63,15 +59,16 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, in video_offset_lock = false; video_aspect_ratio = 4.0/3.0; Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&VideoTimeLine::parameter_changed, this, _1), gui_context()); - video_server_url = video_get_server_url(Config); - server_docroot = video_get_docroot(Config); video_filename = ""; local_file = true; video_file_fps = 25.0; - flush_frames = false; + _flush_frames = false; vmonitor=0; reopen_vmonitor=false; find_xjadeo(); + find_harvid(); + video_server_url = video_get_server_url(Config); + server_docroot = video_get_docroot(Config); VtlUpdate.connect (*this, invalidator (*this), boost::bind (&PublicEditor::queue_visual_videotimeline_update, editor), gui_context()); GuiUpdate.connect (*this, invalidator (*this), boost::bind (&VideoTimeLine::gui_update, this, _1), gui_context()); @@ -90,11 +87,9 @@ VideoTimeLine::save_session () return; } - LocaleGuard lg (X_("POSIX")); - XMLNode* node = new XMLNode(X_("Videomonitor")); if (!node) return; - node->add_property (X_("active"), (vmonitor && vmonitor->is_started())?"yes":"no"); + node->set_property (X_("active"), (vmonitor && vmonitor->is_started())); _session->add_extra_xml (*node); if (vmonitor) { @@ -107,11 +102,11 @@ VideoTimeLine::save_session () /* VTL settings */ node = _session->extra_xml (X_("Videotimeline")); if (!node) return; - node->add_property (X_("id"), id().to_s()); - node->add_property (X_("Height"), editor->get_videotl_bar_height()); - node->add_property (X_("VideoOffsetLock"), video_offset_lock?X_("1"):X_("0")); - node->add_property (X_("VideoOffset"), video_offset); - node->add_property (X_("AutoFPS"), auto_set_session_fps?X_("1"):X_("0")); + node->set_property (X_("id"), id()); + node->set_property (X_("Height"), editor->get_videotl_bar_height()); + node->set_property (X_("VideoOffsetLock"), video_offset_lock); + node->set_property (X_("VideoOffset"), video_offset); + node->set_property (X_("AutoFPS"), auto_set_session_fps); } /* close and save settings */ @@ -124,7 +119,7 @@ VideoTimeLine::close_session () sessionsave.disconnect(); close_video_monitor(); - remove_frames(); + remove_frames (); video_filename = ""; video_duration = 0; GuiUpdate("set-xjadeo-sensitive-off"); @@ -147,8 +142,7 @@ VideoTimeLine::set_session (ARDOUR::Session *s) SessionHandlePtr::set_session (s); if (!_session) { return ; } - _session->SaveSession.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this)); - LocaleGuard lg (X_("POSIX")); + _session->SessionSaveUnderway.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this)); XMLNode* node = _session->extra_xml (X_("Videotimeline")); @@ -160,39 +154,33 @@ VideoTimeLine::set_session (ARDOUR::Session *s) set_id(*node); - const XMLProperty* proph = node->property (X_("Height")); - if (proph) { - editor->set_video_timeline_height(atoi(proph->value())); + int height; + if (node->get_property (X_("Height"), height)) { + editor->set_video_timeline_height(height); } #if 0 /* TODO THINK: set FPS first time only ?! */ - const XMLProperty* propasfps = node->property (X_("AutoFPS")); + XMLProperty const * propasfps = node->property (X_("AutoFPS")); if (propasfps) { auto_set_session_fps = atoi(propasfps->value())?true:false; } #endif - const XMLProperty* propoffset = node->property (X_("VideoOffset")); - if (propoffset) { - video_offset = atoll(propoffset->value()); + if (node->get_property (X_("VideoOffset"), video_offset)) { video_offset_p = video_offset; } - const XMLProperty* proplock = node->property (X_("VideoOffsetLock")); - if (proplock) { - video_offset_lock = atoi(proplock->value())?true:false; - } + node->get_property (X_("VideoOffsetLock"), video_offset_lock); + node->get_property (X_("LocalFile"), local_file); - const XMLProperty* localfile = node->property (X_("LocalFile")); - if (localfile) { - local_file = atoi(localfile->value())?true:false; + std::string filename; + if (node->get_property (X_("Filename"), filename)) { + video_file_info (filename, local_file); } - const XMLProperty* propf = node->property (X_("Filename")); - video_file_info(propf->value(), local_file); - if ((node = _session->extra_xml (X_("Videomonitor")))) { - const XMLProperty* prop = node->property (X_("active")); - if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) { + bool active; + if (node->get_property (X_("active"), active) && active && found_xjadeo () && + !video_filename.empty () && local_file) { open_video_monitor(); } } @@ -229,11 +217,7 @@ VideoTimeLine::save_undo () int VideoTimeLine::set_state (const XMLNode& node, int /*version*/) { - LocaleGuard lg (X_("POSIX")); - const XMLProperty* propoffset = node.property (X_("VideoOffset")); - if (propoffset) { - video_offset = atoll(propoffset->value()); - } + node.get_property (X_("VideoOffset"), video_offset); ARDOUR_UI::instance()->flush_videotimeline_cache(true); return 0; } @@ -242,8 +226,7 @@ XMLNode& VideoTimeLine::get_state () { XMLNode* node = new XMLNode (X_("Videotimeline")); - LocaleGuard lg (X_("POSIX")); - node->add_property (X_("VideoOffset"), video_offset_p); + node->set_property (X_("VideoOffset"), video_offset_p); return *node; } @@ -251,19 +234,19 @@ void VideoTimeLine::remove_frames () { for (VideoFrames::iterator i = video_frames.begin(); i != video_frames.end(); ++i ) { - VideoImageFrame *frame = (*i); + VideoImageFrame* frame = (*i); delete frame; (*i) = 0; } video_frames.clear(); } -VideoImageFrame * -VideoTimeLine::get_video_frame (framepos_t vfn, int cut, int rightend) +VideoImageFrame* +VideoTimeLine::get_video_frame (samplepos_t vfn, int cut, int rightend) { if (vfn==0) cut=0; for (VideoFrames::iterator i = video_frames.begin(); i != video_frames.end(); ++i) { - VideoImageFrame *frame = (*i); + VideoImageFrame* frame = (*i); if (abs(frame->get_video_frame_number()-vfn)<=cut && frame->get_rightend() == rightend) { return frame; } } @@ -284,9 +267,9 @@ VideoTimeLine::get_apv() } if (_session->config.get_videotimeline_pullup()) { - apv = _session->frame_rate(); + apv = _session->sample_rate(); } else { - apv = _session->nominal_frame_rate(); + apv = _session->nominal_sample_rate(); } if (_session->config.get_use_video_file_fps()) { apv /= video_file_fps; @@ -308,7 +291,7 @@ VideoTimeLine::update_video_timeline() } const double samples_per_pixel = editor->get_current_zoom(); - const framepos_t leftmost_sample = editor->leftmost_sample(); + const samplepos_t leftmost_sample = editor->leftmost_sample(); /* Outline: * 1) calculate how many frames there should be in current zoom (plus 1 page on each side) @@ -321,17 +304,17 @@ VideoTimeLine::update_video_timeline() /* video-file and session properties */ double display_vframe_width; /* unit: pixels ; width of one thumbnail in the timeline */ float apv; /* audio samples per video frame; */ - framepos_t leftmost_video_frame; /* unit: video-frame number ; temporary var -> vtl_start */ + samplepos_t leftmost_video_frame; /* unit: video-frame number ; temporary var -> vtl_start */ /* variables needed to render videotimeline -- what needs to computed first */ - framepos_t vtl_start; /* unit: audio-samples ; first displayed video-frame */ - framepos_t vtl_dist; /* unit: audio-samples ; distance between displayed video-frames */ + samplepos_t vtl_start; /* unit: audio-samples ; first displayed video-frame */ + samplepos_t vtl_dist; /* unit: audio-samples ; distance between displayed video-frames */ unsigned int visible_video_frames; /* number of frames that fit on current canvas */ if (_session->config.get_videotimeline_pullup()) { - apv = _session->frame_rate(); + apv = _session->sample_rate(); } else { - apv = _session->nominal_frame_rate(); + apv = _session->nominal_sample_rate(); } if (_session->config.get_use_video_file_fps()) { apv /= video_file_fps; @@ -361,23 +344,27 @@ VideoTimeLine::update_video_timeline() vtl_start -= visible_video_frames * vtl_dist; visible_video_frames *=3; - if (vtl_start < video_offset ) { - visible_video_frames += ceil((double)vtl_start/vtl_dist); + /* don't request frames that are too far to the right */ + if (vtl_start < video_offset) { + visible_video_frames = std::max((double)0.0, (double)visible_video_frames + ceil((double)(vtl_start - video_offset)/vtl_dist)); vtl_start = video_offset; } - /* apply video-file constraints */ + /* apply video-file constraints + * (first frame in video is at video_start_offset) */ if (vtl_start > video_start_offset + video_duration + video_offset ) { visible_video_frames = 0; } - /* TODO optimize: compute rather than iterate */ + /* trim end. + * end = position on timeline (video-offset) minus video-file's first frame position + * TODO optimize: compute rather than iterate */ while (visible_video_frames > 0 && vtl_start + (visible_video_frames-1) * vtl_dist >= video_start_offset + video_duration + video_offset) { --visible_video_frames; } - if (flush_frames) { - remove_frames(); - flush_frames=false; + if (_flush_frames) { + remove_frames (); + _flush_frames = false; } while (video_frames.size() < visible_video_frames) { @@ -393,9 +380,9 @@ VideoTimeLine::update_video_timeline() outdated_video_frames = video_frames; #if 1 - /* when zoomed out, ignore shifts by +-1 frame + /* when zoomed out, ignore shifts by +-1 sample * which can occur due to rounding errors when - * scrolling to a new leftmost-audio frame. + * scrolling to a new leftmost-audio sample. */ int cut =1; if (vtl_dist/apv < 3.0) cut =0; @@ -404,33 +391,33 @@ VideoTimeLine::update_video_timeline() #endif for (unsigned int vfcount=0; vfcount < visible_video_frames; ++vfcount){ - framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-frames */ - framepos_t vframeno = rint ( (vfpos - video_offset) / apv); /* unit: video-frames */ - vfpos = (vframeno * apv ) + video_offset; /* audio-frame corresponding to /rounded/ video-frame */ + samplepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */ + samplepos_t vframeno = rint ( (vfpos - video_offset) / apv); /* unit: video-frames */ + vfpos = (vframeno * apv ) + video_offset; /* audio-sample corresponding to /rounded/ video-frame */ int rightend = -1; /* unit: pixels */ if (vfpos + vtl_dist > video_start_offset + video_duration + video_offset) { rightend = display_vframe_width * (video_start_offset + video_duration + video_offset - vfpos) / vtl_dist; //printf("lf(e): %lu\n", vframeno); // XXX } - VideoImageFrame * frame = get_video_frame(vframeno, cut, rightend); + VideoImageFrame* frame = get_video_frame(vframeno, cut, rightend); if (frame) { frame->set_position(vfpos); - outdated_video_frames.remove(frame); + outdated_video_frames.remove (frame); } else { remaining.push_back(vfcount); } } for (VideoFrames::iterator i = outdated_video_frames.begin(); i != outdated_video_frames.end(); ++i ) { - VideoImageFrame *frame = (*i); + VideoImageFrame* frame = (*i); if (remaining.empty()) { frame->set_position(-2 * vtl_dist + leftmost_sample); /* move off screen */ } else { - int vfcount=remaining.front(); + int vfcount = remaining.front(); remaining.pop_front(); - framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-frames */ - framepos_t vframeno = rint ((vfpos - video_offset) / apv); /* unit: video-frames */ + samplepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */ + samplepos_t vframeno = rint ((vfpos - video_offset) / apv); /* unit: video-frames */ int rightend = -1; /* unit: pixels */ if (vfpos + vtl_dist > video_start_offset + video_duration + video_offset) { rightend = display_vframe_width * (video_start_offset + video_duration + video_offset - vfpos) / vtl_dist; @@ -476,8 +463,8 @@ VideoTimeLine::video_file_info (std::string filename, bool local) GuiUpdate("video-unavailable"); return false; } - video_duration = _duration * _session->nominal_frame_rate() / video_file_fps; - video_start_offset = _start_offset * _session->nominal_frame_rate(); + video_duration = _duration * _session->nominal_sample_rate() / video_file_fps; + video_start_offset = _start_offset * _session->nominal_sample_rate(); if (auto_set_session_fps && video_file_fps != _session->timecode_frames_per_second()) { switch ((int)floorf(video_file_fps*1000.0)) { @@ -557,7 +544,7 @@ VideoTimeLine::check_server () , video_server_url.c_str() , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/" ); - char *res=a3_curl_http_get(url, NULL); + char* res = ArdourCurl::http_get (url, NULL, false); if (res) { if (strstr(res, "status: ok, online.")) { ok = true; } free(res); @@ -579,7 +566,7 @@ VideoTimeLine::check_server_docroot () , video_server_url.c_str() , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/" ); - char *res=a3_curl_http_get(url, NULL); + char* res = ArdourCurl::http_get (url, NULL, false); if (!res) { return false; } @@ -663,7 +650,7 @@ VideoTimeLine::vmon_update () { void VideoTimeLine::flush_local_cache () { - flush_frames = true; + _flush_frames = true; vmon_update(); } @@ -675,7 +662,7 @@ VideoTimeLine::flush_cache () { , video_server_url.c_str() , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/" ); - char *res=a3_curl_http_get(url, NULL); + char* res = ArdourCurl::http_get (url, NULL, false); if (res) { free (res); } @@ -725,52 +712,7 @@ VideoTimeLine::xjadeo_readversion (std::string d, size_t /* s */) { void VideoTimeLine::find_xjadeo () { - std::string xjadeo_file_path; -#ifdef PLATFORM_WINDOWS - HKEY key; - DWORD size = PATH_MAX; - char tmp[PATH_MAX+1]; - const char *program_files = PBD::get_win_special_folder (CSIDL_PROGRAM_FILES); -#endif - if (getenv("XJREMOTE")) { - _xjadeo_bin = getenv("XJREMOTE"); - } else if (find_file (Searchpath(Glib::getenv("PATH")), X_("xjremote"), xjadeo_file_path)) { - _xjadeo_bin = xjadeo_file_path; - } else if (find_file (Searchpath(Glib::getenv("PATH")), X_("xjadeo"), xjadeo_file_path)) { - _xjadeo_bin = xjadeo_file_path; - } -#ifdef __APPLE__ - else if (Glib::file_test(X_("/Applications/Xjadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) { - _xjadeo_bin = X_("/Applications/Xjadeo.app/Contents/MacOS/xjremote"); - } - else if (Glib::file_test(X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) { - _xjadeo_bin = X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"); - } -#endif -#ifdef PLATFORM_WINDOWS - else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ, &key)) - && (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast(tmp), &size)) - ) - { - _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", 0)); - } - else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ | KEY_WOW64_32KEY, &key)) - && (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast(tmp), &size)) - ) - { - _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", 0)); - } - else if (program_files && Glib::file_test(g_build_filename(program_files, "xjadeo", "xjadeo.exe", 0), Glib::FILE_TEST_EXISTS)) - { - _xjadeo_bin = std::string(g_build_filename(program_files, "xjadeo", "xjadeo.exe", 0)); - } - /* generic fallback to try */ - else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjadeo.exe"), Glib::FILE_TEST_EXISTS)) { - _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjadeo.exe"); - } -#endif - else { - _xjadeo_bin = X_(""); + if (!ArdourVideoToolPaths::xjadeo_exe(_xjadeo_bin)) { warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ " "(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. " "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').\n" @@ -778,6 +720,7 @@ VideoTimeLine::find_xjadeo () { "see also http://manual.ardour.org/video-timeline/setup/") << endmsg; } + if (found_xjadeo ()) { ARDOUR::SystemExec version_check(_xjadeo_bin, X_("--version")); xjadeo_version = ""; @@ -791,7 +734,12 @@ VideoTimeLine::find_xjadeo () { return; } - version_check.wait (); +#ifdef PLATFORM_WINDOWS + version_check.wait (); // 40ms timeout +#else + version_check.wait (WNOHANG); +#endif + int timeout = 300; while (xjadeo_version.empty() && --timeout) { Glib::usleep(10000); @@ -819,6 +767,61 @@ VideoTimeLine::find_xjadeo () { } } +void +VideoTimeLine::harvid_readversion (std::string d, size_t /* s */) { + harvid_version += d; +} + +void +VideoTimeLine::find_harvid () { + /* This is mainly for the benefit of the windows version: + * harvid >= 0.8.2 allows an empty docroot and ardour can + * pass the drive-letter along. + * + * It is a chicken/egg w.r.t. the video-server dialog + * but needed for default preferences and initial settings. + */ + std::string harvid_bin; + if (VideoUtils::harvid_version != 0x0) { + return; + } + if (!ArdourVideoToolPaths::harvid_exe(harvid_bin)) { + return; + } + if (harvid_bin.empty ()) { + return; + } + ARDOUR::SystemExec version_check(harvid_bin, X_("--version")); + harvid_version = ""; + version_check.ReadStdout.connect_same_thread (*this, boost::bind (&VideoTimeLine::harvid_readversion, this, _1 ,_2)); + version_check.Terminated.connect_same_thread (*this, boost::bind (&VideoTimeLine::harvid_readversion, this, "\n" ,1)); + if (version_check.start(2)) { + return; + } + +#ifdef PLATFORM_WINDOWS + version_check.wait (); // 40ms timeout +#else + version_check.wait (WNOHANG); +#endif + + int timeout = 300; + while (harvid_version.empty() && --timeout) { + Glib::usleep(10000); + } + + size_t vo = harvid_version.find("harvid v"); + if (vo != string::npos) { + int v_major, v_minor, v_micro; + if(sscanf(harvid_version.substr(vo + 8, string::npos).c_str(),"%d.%d.%d", + &v_major, &v_minor, &v_micro) == 3) + { + VideoUtils::harvid_version = (v_major << 16) | (v_minor << 8) | v_micro; + info << "harvid version: "<< hex << VideoUtils::harvid_version << endmsg; + } + } +} + void VideoTimeLine::open_video_monitor() { if (!found_xjadeo()) return; @@ -844,7 +847,7 @@ VideoTimeLine::open_video_monitor() { /* load mask from Session */ XMLNode* node = _session->extra_xml (X_("XJRestoreSettings")); if (node) { - const XMLProperty* prop = node->property (X_("mask")); + XMLProperty const * prop = node->property (X_("mask")); if (prop) { xj_settings_mask = atoi(prop->value()); } @@ -865,8 +868,10 @@ VideoTimeLine::open_video_monitor() { if (_session) { XMLNode* node = _session->extra_xml (X_("Videomonitor")); if (node) { - const XMLProperty* prop = node->property (X_("active")); - if (prop && prop->value() != "yes") _session->set_dirty (); + bool active; + if (node->get_property (X_("active"), active) && !active) { + _session->set_dirty (); + } } else { _session->set_dirty (); } @@ -910,7 +915,7 @@ VideoTimeLine::terminated_video_monitor () { } void -VideoTimeLine::manual_seek_video_monitor (framepos_t pos) +VideoTimeLine::manual_seek_video_monitor (samplepos_t pos) { if (!vmonitor) { return; } if (!vmonitor->is_started()) { return; }