summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2012-10-12 21:28:08 +0000
committerRobin Gareus <robin@gareus.org>2012-10-12 21:28:08 +0000
commit5eeecf82a0432c1ed951886539a7331c71c15af9 (patch)
treec55bcb8c2ed8deb6c14118931dd891a6a43bf01a /libs
parent6de548bd7f7e04075eb7a26d4ea0ad04ff71b589 (diff)
LTC slave - basic working version (hardcoded 25fps)
git-svn-id: svn://localhost/ardour2/branches/3.0@13263 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/ardour/debug.h1
-rw-r--r--libs/ardour/ardour/slave.h20
-rw-r--r--libs/ardour/debug.cc1
-rw-r--r--libs/ardour/ltc_slave.cc125
4 files changed, 114 insertions, 33 deletions
diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h
index 334aac53e6..dd76f14603 100644
--- a/libs/ardour/ardour/debug.h
+++ b/libs/ardour/ardour/debug.h
@@ -39,6 +39,7 @@ namespace PBD {
extern uint64_t Graph;
extern uint64_t Destruction;
extern uint64_t MTC;
+ extern uint64_t LTC;
extern uint64_t Transport;
extern uint64_t Slave;
extern uint64_t SessionEvents;
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index fa75ba17bb..24fd79c943 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -310,7 +310,7 @@ class MTC_Slave : public TimecodeSlave {
#ifdef HAVE_LTC
class LTC_Slave : public TimecodeSlave {
- public:
+public:
LTC_Slave (Session&);
~LTC_Slave ();
@@ -327,19 +327,27 @@ class LTC_Slave : public TimecodeSlave {
Timecode::TimecodeFormat apparent_timecode_format() const;
private:
- int parse_ltc(const jack_nframes_t nframes, const jack_default_audio_sample_t * const in, const framecnt_t posinfo);
- void process_ltc();
+ int parse_ltc(const jack_nframes_t, const jack_default_audio_sample_t * const, const framecnt_t);
+ bool process_ltc(framepos_t, framecnt_t);
+ void init_ltc_dll(framepos_t, double);
Session& session;
bool did_reset_tc_format;
Timecode::TimecodeFormat saved_tc_format;
- LTCDecoder *decoder;
- framecnt_t current_frames_per_ltc_frame;
- framecnt_t monotonic_fcnt;
+ LTCDecoder *decoder;
+ double frames_per_ltc_frame;
+ framecnt_t last_timestamp;
+ framecnt_t last_ltc_frame;
framepos_t ltc_transport_pos;
double ltc_speed;
+
+ /* DLL - chase MTC */
+ double t0; ///< time at the beginning of the MTC quater frame
+ double t1; ///< calculated end of the MTC quater frame
+ double e2; ///< second order loop error
+ double b, c, omega; ///< DLL filter coefficients
};
#endif
diff --git a/libs/ardour/debug.cc b/libs/ardour/debug.cc
index 0d0948d576..36c9b6adb0 100644
--- a/libs/ardour/debug.cc
+++ b/libs/ardour/debug.cc
@@ -36,6 +36,7 @@ uint64_t PBD::DEBUG::ProcessThreads = PBD::new_debug_bit ("processthreads");
uint64_t PBD::DEBUG::Graph = PBD::new_debug_bit ("graph");
uint64_t PBD::DEBUG::Destruction = PBD::new_debug_bit ("destruction");
uint64_t PBD::DEBUG::MTC = PBD::new_debug_bit ("mtc");
+uint64_t PBD::DEBUG::LTC = PBD::new_debug_bit ("ltc");
uint64_t PBD::DEBUG::Transport = PBD::new_debug_bit ("transport");
uint64_t PBD::DEBUG::Slave = PBD::new_debug_bit ("slave");
uint64_t PBD::DEBUG::SessionEvents = PBD::new_debug_bit ("sessionevents");
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index 51fa181414..14cb3ae59d 100644
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -42,12 +42,12 @@ using namespace Timecode;
LTC_Slave::LTC_Slave (Session& s)
: session (s)
{
- current_frames_per_ltc_frame = 1920; // samplerate / framerate
+ frames_per_ltc_frame = 1920.0; // samplerate / framerate
ltc_transport_pos = 0;
ltc_speed = 1.0;
- monotonic_fcnt = 0;
+ last_timestamp = 0;
- decoder = ltc_decoder_create(current_frames_per_ltc_frame, 128 /*queue size*/);
+ decoder = ltc_decoder_create((int) frames_per_ltc_frame, 128 /*queue size*/);
}
LTC_Slave::~LTC_Slave()
@@ -69,13 +69,13 @@ LTC_Slave::give_slave_full_control_over_transport_speed() const
ARDOUR::framecnt_t
LTC_Slave::resolution () const
{
- return current_frames_per_ltc_frame;
+ return (framecnt_t) (frames_per_ltc_frame);
}
ARDOUR::framecnt_t
LTC_Slave::seekahead_distance () const
{
- return current_frames_per_ltc_frame * 2;
+ return (framecnt_t) (frames_per_ltc_frame * 2);
}
bool
@@ -105,15 +105,23 @@ LTC_Slave::parse_ltc(const jack_nframes_t nframes, const jack_default_audio_samp
return 0;
}
-void
-LTC_Slave::process_ltc()
+bool
+LTC_Slave::process_ltc(framepos_t now, framecnt_t nframes)
{
+ Time timecode;
+ bool have_frame = false;
+
+ framepos_t sess_pos = session.transport_frame(); // corresponds to now
+ //sess_pos -= session.engine().frames_since_cycle_start();
+
+ DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC Process eng-tme: %1 eng-pos: %2\n", now, sess_pos));
+
LTCFrameExt frame;
while (ltc_decoder_read(decoder,&frame)) {
SMPTETimecode stime;
ltc_frame_to_time(&stime, &frame.ltc, 0);
-
- fprintf(stdout, "%02d:%02d:%02d%c%02d | %8lld %8lld%s\n",
+#if 1
+ fprintf(stdout, "LTC %02d:%02d:%02d%c%02d | %8lld %8lld%s\n",
stime.hours,
stime.mins,
stime.secs,
@@ -123,24 +131,78 @@ LTC_Slave::process_ltc()
frame.off_end,
frame.reverse ? " R" : " "
);
+#endif
+
+ timecode.negative = false;
+ timecode.subframes = 0;
+ timecode.drop = (frame.ltc.dfbit)? true : false;
+ timecode.rate = 25.0; // XXX
/* when a full LTC frame is decoded, the timecode the LTC frame
* is referring has just passed.
* So we send the _next_ timecode which
* is expected to start at the end of the current frame
*/
-
- int detected_fps = 25; // XXX
+ int fps_i = ceil(timecode.rate);
if (!frame.reverse) {
- ltc_frame_increment(&frame.ltc, detected_fps , 0);
+ ltc_frame_increment(&frame.ltc, fps_i , 0);
ltc_frame_to_time(&stime, &frame.ltc, 0);
} else {
- ltc_frame_decrement(&frame.ltc, detected_fps , 0);
+ ltc_frame_decrement(&frame.ltc, fps_i , 0);
int off = frame.off_end - frame.off_start;
frame.off_start += off;
frame.off_end += off;
}
+
+ timecode.hours = stime.hours;
+ timecode.minutes = stime.mins;
+ timecode.seconds = stime.secs;
+ timecode.frames = stime.frame;
+
+ framepos_t ltc_frame;
+ session.timecode_to_sample (timecode, ltc_frame, true, false);
+
+ double poff = (frame.off_end - now);
+
+ ltc_transport_pos = ltc_frame - poff;
+ frames_per_ltc_frame = (double(session.frame_rate()) / timecode.rate);
+ //frames_per_ltc_frame = frame.off_end - frame.off_start; // the first one is off.
+
+ DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC frame: %1 poff: %2 pos :%3\n", ltc_frame, poff, ltc_transport_pos));
+
+ if (last_timestamp == 0 || ((now - last_timestamp) > 4 * frames_per_ltc_frame) ) {
+ init_ltc_dll(ltc_frame, frames_per_ltc_frame);
+ ltc_speed = 1.0; // XXX
+ } else {
+
+ double e = (double(ltc_frame) - poff - double(sess_pos));
+ // update DLL
+ t0 = t1;
+ t1 += b * e + e2;
+ e2 += c * e;
+
+ ltc_speed = (t1 - t0) / frames_per_ltc_frame;
+ DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC DLL t0:%1 t1:%2 err:%3 spd:%4 ddt:%5\n", t0, t1, e, ltc_speed, e2 - frames_per_ltc_frame));
+
+ }
+ last_timestamp = now;
+ last_ltc_frame = ltc_frame;
+ have_frame = true;
}
+ return have_frame;
+}
+
+void
+LTC_Slave::init_ltc_dll(framepos_t tme, double dt)
+{
+ omega = 2.0 * M_PI * dt / double(session.frame_rate());
+ b = 1.4142135623730950488 * omega;
+ c = omega * omega;
+
+ e2 = dt;
+ t0 = double(tme);
+ t1 = t0 + e2;
+ DEBUG_TRACE (DEBUG::LTC, string_compose ("[re-]init LTC DLL %1 %2 %3\n", t0, t1, e2));
}
/* main entry point from session_process.cc
@@ -149,30 +211,39 @@ LTC_Slave::process_ltc()
bool
LTC_Slave::speed_and_position (double& speed, framepos_t& pos)
{
- DEBUG_TRACE (DEBUG::MTC, string_compose ("LTC_Slave::speed_and_position - TID:%1\n", ::pthread_self()));
+
framepos_t now = session.engine().frame_time_at_cycle_start();
- framepos_t sess_pos = session.transport_frame(); // corresponds to now
framecnt_t nframes = session.engine().frames_per_cycle();
-
- jack_port_t *ltc_port = session.engine().ltc_input_port()->jack_port();
jack_default_audio_sample_t *in;
- in = (jack_default_audio_sample_t*) jack_port_get_buffer (ltc_port, nframes);
+ jack_latency_range_t ltc_latency;
+
+ Port *ltcport = session.engine().ltc_input_port();
+ ltcport->get_connected_latency_range(ltc_latency, false);
+ in = (jack_default_audio_sample_t*) jack_port_get_buffer (ltcport->jack_port(), nframes);
- //in = session.engine().ltc_input_port()->engine_get_whole_audio_buffer()
- // TODO: get capture latency for ltc_port.
+ DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC_Slave::speed_and_position - TID:%1 | latency: %2\n", ::pthread_self(), ltc_latency.max));
if (in) {
- parse_ltc(nframes, in, monotonic_fcnt /* + jltc_latency*/ );
- process_ltc();
+ parse_ltc(nframes, in, now + ltc_latency.max );
+ if (!process_ltc(now, nframes)) {
+ /* fly wheel */
+ double elapsed = (now - last_timestamp) * ltc_speed;
+ ltc_transport_pos = last_ltc_frame + elapsed;
+ DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC fly wheel elapsed: %1 @speed %2\n", elapsed, ltc_speed));
+ }
+ }
+
+ if (((now - last_timestamp) > 4 * frames_per_ltc_frame) ) {
+ DEBUG_TRACE (DEBUG::LTC, "LTC no-signal - reset\n");
+ speed = ltc_speed = 0;
+ pos = session.transport_frame();
+ last_timestamp = 0;
+ return true;
}
- /* fake for testing */
- ltc_transport_pos += nframes * ltc_speed;
pos = ltc_transport_pos;
speed = ltc_speed;
- monotonic_fcnt += nframes;
-
return true;
}
@@ -180,5 +251,5 @@ Timecode::TimecodeFormat
LTC_Slave::apparent_timecode_format () const
{
/* XXX to be computed, determined from incoming stream */
- return timecode_30;
+ return timecode_25;
}