diff options
| author | Robin Gareus <robin@gareus.org> | 2012-11-09 07:48:08 +0000 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2012-11-09 07:48:08 +0000 |
| commit | f2009ea7771048a89463fea25f0bad9de1e17567 (patch) | |
| tree | 2dd656c70a940b13d8fd256658a8e4a083894e29 /libs/ardour/ltc_slave.cc | |
| parent | e38ac84184d2719b982e1d71964fe6db7bdff56c (diff) | |
LTC slave fix fps detection with 29.97000 option
git-svn-id: svn://localhost/ardour2/branches/3.0@13405 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ltc_slave.cc')
| -rw-r--r-- | libs/ardour/ltc_slave.cc | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 4e25c6f384..d52a70cab5 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -198,22 +198,23 @@ LTC_Slave::detect_ltc_fps(int frameno, bool df) } ltc_detect_fps_cnt++; - if (ltc_detect_fps_cnt > 40) - { - if (ltc_detect_fps_cnt > ltc_detect_fps_max - && ( ceil(timecode.rate) != (ltc_detect_fps_max + 1) - || timecode.drop != df - ) - ) - { - DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC detected FPS %1%2", - ltc_detect_fps_max + 1, timecode.drop ? "df" : "")); + if (ltc_detect_fps_cnt > 40) { + if (ltc_detect_fps_cnt > ltc_detect_fps_max) { detected_fps = ltc_detect_fps_max + 1; if (df) { /* LTC df -> indicates fractional framerate */ - detected_fps = detected_fps * 1000.0 / 1001.0; + if (Config->get_timecode_source_2997()) { + detected_fps = detected_fps * 999.0 / 1000.0; + } else { + detected_fps = detected_fps * 1000.0 / 1001.0; + } + } + + if (timecode.rate != detected_fps || timecode.drop != df) { + DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC detected FPS: %1%2\n", detected_fps, df?"df":"ndf")); + } else { + detected_fps = 0; /* no cange */ } - DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC detected FPS: %1%2\n", detected_fps, df?"df":"ndf")); } ltc_detect_fps_cnt = ltc_detect_fps_max = 0; } @@ -232,14 +233,6 @@ LTC_Slave::detect_ltc_fps(int frameno, bool df) TimecodeFormat tc_format = apparent_timecode_format(); TimecodeFormat cur_timecode = session.config.get_timecode_format(); - if (Config->get_timecode_source_2997() && tc_format == Timecode::timecode_2997drop) { - tc_format = Timecode::timecode_2997000drop; - } - else - if (Config->get_timecode_source_2997() && tc_format == Timecode::timecode_2997) { - tc_format = Timecode::timecode_2997000; - } - if (Config->get_timecode_sync_frame_rate()) { /* enforce time-code */ if (!did_reset_tc_format) { @@ -519,9 +512,9 @@ LTC_Slave::apparent_timecode_format () const else if (timecode.rate == 25 && !timecode.drop) return timecode_25; else if (rint(timecode.rate * 100) == 2997 && !timecode.drop) - return timecode_2997; + return (Config->get_timecode_source_2997() ? timecode_2997000 : timecode_2997); else if (rint(timecode.rate * 100) == 2997 && timecode.drop) - return timecode_2997drop; + return (Config->get_timecode_source_2997() ? timecode_2997000drop : timecode_2997drop); else if (timecode.rate == 30 && timecode.drop) return timecode_2997drop; // timecode_30drop; // LTC counting to 30 frames w/DF *means* 29.97 df else if (timecode.rate == 30 && !timecode.drop) |