Revert "timecodestamper: LTC from audio"

This reverts commit c01afab9f7fa7e822dea38e358e92163e8d36282.

Was not ready to be pushed yet

2 files changed, 44 insertions, 624 deletions

diff --git a/gst/timecode/gsttimecodestamper.c b/gst/timecode/gsttimecodestamper.c
index 4a6cfd67d..b3c513ca0 100644
--- a/gst/timecode/gsttimecodestamper.c
+++ b/gst/timecode/gsttimecodestamper.c
@@ -44,12 +44,9 @@
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
-#include <gst/audio/audio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ABSDIFF(a,b) (((a) > (b)) ? ((a) - (b)) : ((b) - (a)))
-
 GST_DEBUG_CATEGORY_STATIC (timecodestamper_debug);
 #define GST_CAT_DEFAULT timecodestamper_debug
 
@@ -57,14 +54,12 @@ GST_DEBUG_CATEGORY_STATIC (timecodestamper_debug);
 enum
 {
   PROP_0,
-  PROP_SOURCE,
+  PROP_OVERRIDE_EXISTING,
   PROP_DROP_FRAME,
   PROP_DAILY_JAM,
   PROP_POST_MESSAGES,
   PROP_FIRST_TIMECODE,
-  PROP_FIRST_NOW,
-  PROP_LTC_MAX_OFFSET,
-  PROP_LTC_ADD
+  PROP_FIRST_NOW
 };
 
 #define DEFAULT_OVERRIDE_EXISTING FALSE
@@ -72,8 +67,6 @@ enum
 #define DEFAULT_DAILY_JAM NULL
 #define DEFAULT_POST_MESSAGES FALSE
 #define DEFAULT_FIRST_NOW FALSE
-#define DEFAULT_LTC_QUEUE 100
-#define DEFAULT_LTC_MAX_OFFSET 250000000
 
 static GstStaticPadTemplate gst_timecodestamper_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
@@ -89,13 +82,6 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("video/x-raw")
     );
 
-static GstStaticPadTemplate gst_timecodestamper_ltc_template =
-GST_STATIC_PAD_TEMPLATE ("ltc_sink",
-    GST_PAD_SINK,
-    GST_PAD_REQUEST,
-    GST_STATIC_CAPS ("audio/x-raw,format=U8,rate=[1,max],channels=1")
-    );
-
 static void gst_timecodestamper_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_timecodestamper_get_property (GObject * object, guint prop_id,
@@ -106,53 +92,10 @@ static gboolean gst_timecodestamper_sink_event (GstBaseTransform * trans,
 static GstFlowReturn gst_timecodestamper_transform_ip (GstBaseTransform *
     vfilter, GstBuffer * buffer);
 static gboolean gst_timecodestamper_stop (GstBaseTransform * trans);
-static gboolean gst_timecodestamper_start (GstBaseTransform * trans);
-static GstPad *gst_timecodestamper_request_new_pad (GstElement * element,
-    GstPadTemplate * temp, const gchar * unused, const GstCaps * caps);
-static void gst_timecodestamper_release_pad (GstElement * element,
-    GstPad * pad);
-
-static GstFlowReturn gst_timecodestamper_ltcpad_chain (GstPad * pad,
-    GstObject * parent, GstBuffer * buffer);
-static gboolean gst_timecodestamper_ltcpad_event (GstPad * pad,
-    GstObject * parent, GstEvent * event);
-static gboolean gst_timecodestamper_ltcpad_query (GstPad * pad,
-    GstObject * parent, GstQuery * query);
-static gboolean gst_timecodestamper_pad_activatemode (GstPad * pad,
-    GstObject * parent, GstPadMode mode, gboolean active);
 
 G_DEFINE_TYPE (GstTimeCodeStamper, gst_timecodestamper,
     GST_TYPE_BASE_TRANSFORM);
 
-GType
-gst_timecodestamper_source_get_type (void)
-{
-  static GType gst_timecodestamper_source_type = 0;
-  static const GEnumValue gst_timecodestamper_source[] = {
-    {GST_TIME_CODE_STAMPER_NOREPLACE,
-        "Internal counter if there is no timecode, "
-          "otherwise keep existing one", "noreplace"},
-    {GST_TIME_CODE_STAMPER_INTERN,
-        "Always timecodestamper's internal counter", "intern"},
-    {GST_TIME_CODE_STAMPER_EXISTING,
-        "Only existing timecode, frames without timecode "
-          "stay without timecode", "existing"},
-    {GST_TIME_CODE_STAMPER_LTC,
-        "Linear time code from an audio device", "ltc"},
-    {GST_TIME_CODE_STAMPER_NRZERO,
-        "Zero if there is no timecode, "
-          "otherwise keep existing one", "noreplace-zero"},
-    {0, NULL, NULL},
-  };
-
-  if (!gst_timecodestamper_source_type) {
-    gst_timecodestamper_source_type =
-        g_enum_register_static ("GstTimeCodeStamperSource",
-        gst_timecodestamper_source);
-  }
-  return gst_timecodestamper_source_type;
-}
-
 static void
 gst_timecodestamper_class_init (GstTimeCodeStamperClass * klass)
 {
@@ -164,17 +107,16 @@ gst_timecodestamper_class_init (GstTimeCodeStamperClass * klass)
       "timecodestamper");
   gst_element_class_set_static_metadata (element_class, "Timecode stamper",
       "Filter/Video", "Attaches a timecode meta into each video frame",
-      "Vivia Nikolaidou <vivia@toolsonair.com>");
+      "Vivia Nikolaidou <vivia@toolsonair.com");
 
   gobject_class->set_property = gst_timecodestamper_set_property;
   gobject_class->get_property = gst_timecodestamper_get_property;
   gobject_class->dispose = gst_timecodestamper_dispose;
 
-  g_object_class_install_property (gobject_class, PROP_SOURCE,
-      g_param_spec_enum ("timecode-source", "Timecode to use",
-          "Choose from what source the timecode should be taken",
-          GST_TYPE_TIME_CODE_STAMPER_SOURCE,
-          GST_TIME_CODE_STAMPER_INTERN,
+  g_object_class_install_property (gobject_class, PROP_OVERRIDE_EXISTING,
+      g_param_spec_boolean ("override-existing", "Override existing timecode",
+          "If set to true, any existing timecode will be overridden",
+          DEFAULT_OVERRIDE_EXISTING,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (gobject_class, PROP_DROP_FRAME,
       g_param_spec_boolean ("drop-frame", "Override existing timecode",
@@ -204,35 +146,14 @@ gst_timecodestamper_class_init (GstTimeCodeStamperClass * klass)
           "If true and first-timecode is unset, set it to system time "
           "automatically when the first media segment is received.",
           DEFAULT_FIRST_NOW, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (gobject_class, PROP_LTC_MAX_OFFSET,
-      g_param_spec_uint64 ("ltc-max-offset",
-          "Maximum offset of LTC to video, in nanoseconds",
-          "Maximum number of nanoseconds the LTC audio may be ahead "
-          "or behind the video. Buffers not in this range are ignored.",
-          0, G_MAXUINT64, DEFAULT_LTC_MAX_OFFSET,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (gobject_class, PROP_LTC_ADD,
-      g_param_spec_int ("ltc-add",
-          "Add this number of frames to LTC timecode.",
-          "Add this number of frames to LTC timecode, "
-          "useful if there is an offset between your LTC source and video.",
-          G_MININT, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_timecodestamper_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_timecodestamper_src_template));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_timecodestamper_ltc_template));
-
-  element_class->request_new_pad =
-      GST_DEBUG_FUNCPTR (gst_timecodestamper_request_new_pad);
-  element_class->release_pad =
-      GST_DEBUG_FUNCPTR (gst_timecodestamper_release_pad);
 
   trans_class->sink_event = GST_DEBUG_FUNCPTR (gst_timecodestamper_sink_event);
   trans_class->stop = GST_DEBUG_FUNCPTR (gst_timecodestamper_stop);
-  trans_class->start = GST_DEBUG_FUNCPTR (gst_timecodestamper_start);
 
   trans_class->transform_ip =
       GST_DEBUG_FUNCPTR (gst_timecodestamper_transform_ip);
@@ -241,35 +162,13 @@ gst_timecodestamper_class_init (GstTimeCodeStamperClass * klass)
 static void
 gst_timecodestamper_init (GstTimeCodeStamper * timecodestamper)
 {
-  timecodestamper->tc_source = GST_TIME_CODE_STAMPER_INTERN;
+  timecodestamper->override_existing = DEFAULT_OVERRIDE_EXISTING;
   timecodestamper->drop_frame = DEFAULT_DROP_FRAME;
   timecodestamper->current_tc = gst_video_time_code_new_empty ();
-  timecodestamper->ltc_current_tc = gst_video_time_code_new_empty ();
   timecodestamper->first_tc = NULL;
   timecodestamper->current_tc->config.latest_daily_jam = DEFAULT_DAILY_JAM;
-  timecodestamper->ltc_current_tc->config.latest_daily_jam = DEFAULT_DAILY_JAM;
-  timecodestamper->ltc_intern_tc = NULL;
   timecodestamper->post_messages = DEFAULT_POST_MESSAGES;
   timecodestamper->first_tc_now = DEFAULT_FIRST_NOW;
-  timecodestamper->is_flushing = FALSE;
-  timecodestamper->no_wait = FALSE;
-  timecodestamper->ltcpad = NULL;
-  g_mutex_init (&timecodestamper->mutex);
-#if HAVE_LTC
-  timecodestamper->ltc_dec = NULL;
-  timecodestamper->ltc_max_offset = DEFAULT_LTC_MAX_OFFSET;
-  timecodestamper->ltc_add = 0;
-  timecodestamper->ltc_first_runtime = 0;
-  timecodestamper->ltc_audio_endtime = 0;
-
-  g_cond_init (&timecodestamper->ltc_cond_video);
-  g_cond_init (&timecodestamper->ltc_cond_audio);
-#endif
-
-  gst_pad_set_activatemode_function (GST_BASE_TRANSFORM_SINK_PAD
-      (timecodestamper),
-      GST_DEBUG_FUNCPTR (gst_timecodestamper_pad_activatemode));
-
 }
 
 static void
@@ -277,22 +176,11 @@ gst_timecodestamper_dispose (GObject * object)
 {
   GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (object);
 
-#if HAVE_LTC
-  g_cond_clear (&timecodestamper->ltc_cond_video);
-  g_cond_clear (&timecodestamper->ltc_cond_audio);
-#endif
-  g_mutex_clear (&timecodestamper->mutex);
-
   if (timecodestamper->current_tc != NULL) {
     gst_video_time_code_free (timecodestamper->current_tc);
     timecodestamper->current_tc = NULL;
   }
 
-  if (timecodestamper->ltc_current_tc != NULL) {
-    gst_video_time_code_free (timecodestamper->ltc_current_tc);
-    timecodestamper->ltc_current_tc = NULL;
-  }
-
   if (timecodestamper->first_tc != NULL) {
     gst_video_time_code_free (timecodestamper->first_tc);
     timecodestamper->first_tc = NULL;
@@ -308,24 +196,18 @@ gst_timecodestamper_set_property (GObject * object, guint prop_id,
   GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (object);
 
   switch (prop_id) {
-    case PROP_SOURCE:
-      timecodestamper->tc_source = (GstTimeCodeStamperSource)
-          g_value_get_enum (value);
+    case PROP_OVERRIDE_EXISTING:
+      timecodestamper->override_existing = g_value_get_boolean (value);
       break;
     case PROP_DROP_FRAME:
       timecodestamper->drop_frame = g_value_get_boolean (value);
       break;
     case PROP_DAILY_JAM:
       if (timecodestamper->current_tc->config.latest_daily_jam)
-        g_date_time_unref (timecodestamper->current_tc->config.
-            latest_daily_jam);
+        g_date_time_unref (timecodestamper->current_tc->
+            config.latest_daily_jam);
       timecodestamper->current_tc->config.latest_daily_jam =
           g_value_dup_boxed (value);
-      timecodestamper->ltc_current_tc->config.latest_daily_jam =
-          timecodestamper->current_tc->config.latest_daily_jam !=
-          NULL ? g_date_time_ref (timecodestamper->current_tc->config.
-          latest_daily_jam)
-          : NULL;
       break;
     case PROP_POST_MESSAGES:
       timecodestamper->post_messages = g_value_get_boolean (value);
@@ -338,12 +220,6 @@ gst_timecodestamper_set_property (GObject * object, guint prop_id,
     case PROP_FIRST_NOW:
       timecodestamper->first_tc_now = g_value_get_boolean (value);
       break;
-    case PROP_LTC_MAX_OFFSET:
-      timecodestamper->ltc_max_offset = g_value_get_uint64 (value);
-      break;
-    case PROP_LTC_ADD:
-      timecodestamper->ltc_add = g_value_get_int (value);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -357,8 +233,8 @@ gst_timecodestamper_get_property (GObject * object, guint prop_id,
   GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (object);
 
   switch (prop_id) {
-    case PROP_SOURCE:
-      g_value_set_enum (value, timecodestamper->tc_source);
+    case PROP_OVERRIDE_EXISTING:
+      g_value_set_boolean (value, timecodestamper->override_existing);
       break;
     case PROP_DROP_FRAME:
       g_value_set_boolean (value, timecodestamper->drop_frame);
@@ -376,12 +252,6 @@ gst_timecodestamper_get_property (GObject * object, guint prop_id,
     case PROP_FIRST_NOW:
       g_value_set_boolean (value, timecodestamper->first_tc_now);
       break;
-    case PROP_LTC_MAX_OFFSET:
-      g_value_set_uint64 (value, timecodestamper->ltc_max_offset);
-      break;
-    case PROP_LTC_ADD:
-      g_value_set_int (value, timecodestamper->ltc_add);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -393,41 +263,12 @@ gst_timecodestamper_set_drop_frame (GstTimeCodeStamper * timecodestamper)
 {
   if (timecodestamper->drop_frame && timecodestamper->vinfo.fps_d == 1001 &&
       (timecodestamper->vinfo.fps_n == 30000 ||
-          timecodestamper->vinfo.fps_d == 60000)) {
+          timecodestamper->vinfo.fps_d == 60000))
     timecodestamper->current_tc->config.flags |=
         GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME;
-    timecodestamper->ltc_current_tc->config.flags |=
-        GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME;
-  } else {
+  else
     timecodestamper->current_tc->config.flags &=
         ~GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME;
-    timecodestamper->ltc_current_tc->config.flags &=
-        ~GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME;
-  }
-}
-
-static void
-pad_flushing (GstTimeCodeStamper * timecodestamper)
-{
-#if HAVE_LTC
-  g_mutex_lock (&timecodestamper->mutex);
-  timecodestamper->is_flushing = TRUE;
-  timecodestamper->no_wait = TRUE;
-  g_cond_signal (&timecodestamper->ltc_cond_video);
-  g_cond_signal (&timecodestamper->ltc_cond_audio);
-  g_mutex_unlock (&timecodestamper->mutex);
-#endif
-}
-
-static void
-pad_flush_stop (GstTimeCodeStamper * timecodestamper)
-{
-#if HAVE_LTC
-  g_mutex_lock (&timecodestamper->mutex);
-  timecodestamper->is_flushing = FALSE;
-  timecodestamper->no_wait = FALSE;
-  g_mutex_unlock (&timecodestamper->mutex);
-#endif
 }
 
 static gboolean
@@ -437,23 +278,6 @@ gst_timecodestamper_stop (GstBaseTransform * trans)
 
   gst_video_info_init (&timecodestamper->vinfo);
 
-  if (timecodestamper->ltc_intern_tc != NULL) {
-    gst_video_time_code_free (timecodestamper->ltc_intern_tc);
-    timecodestamper->ltc_intern_tc = NULL;
-  }
-
-  pad_flushing (timecodestamper);
-
-  return TRUE;
-}
-
-static gboolean
-gst_timecodestamper_start (GstBaseTransform * trans)
-{
-  GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (trans);
-
-  pad_flush_stop (timecodestamper);
-
   return TRUE;
 }
 
@@ -470,7 +294,6 @@ gst_timecodestamper_reset_timecode (GstTimeCodeStamper * timecodestamper)
     jam =
         g_date_time_ref (timecodestamper->current_tc->config.latest_daily_jam);
   gst_video_time_code_clear (timecodestamper->current_tc);
-  gst_video_time_code_clear (timecodestamper->ltc_current_tc);
   /* FIXME: What if the buffer doesn't contain both top and bottom fields? */
   gst_video_time_code_init (timecodestamper->current_tc,
       timecodestamper->vinfo.fps_n,
@@ -479,13 +302,6 @@ gst_timecodestamper_reset_timecode (GstTimeCodeStamper * timecodestamper)
       timecodestamper->vinfo.interlace_mode ==
       GST_VIDEO_INTERLACE_MODE_PROGRESSIVE ? 0 :
       GST_VIDEO_TIME_CODE_FLAGS_INTERLACED, 0, 0, 0, 0, 0);
-  gst_video_time_code_init (timecodestamper->ltc_current_tc,
-      timecodestamper->vinfo.fps_n,
-      timecodestamper->vinfo.fps_d,
-      jam,
-      timecodestamper->vinfo.interlace_mode ==
-      GST_VIDEO_INTERLACE_MODE_PROGRESSIVE ? 0 :
-      GST_VIDEO_TIME_CODE_FLAGS_INTERLACED, 0, 0, 0, 0, 0);
   if (jam)
     g_date_time_unref (jam);
   if (timecodestamper->first_tc) {
@@ -514,17 +330,11 @@ gst_timecodestamper_sink_event (GstBaseTransform * trans, GstEvent * event)
       gchar *tc_str;
       gboolean notify = FALSE;
 
-      g_mutex_lock (&timecodestamper->mutex);
+      GST_OBJECT_LOCK (timecodestamper);
 
-      if (timecodestamper->vinfo.fps_n == 0) {
-        g_mutex_unlock (&timecodestamper->mutex);
-        return
-            GST_BASE_TRANSFORM_CLASS
-            (gst_timecodestamper_parent_class)->sink_event (trans, event);
-      }
       gst_event_copy_segment (event, &segment);
       if (segment.format != GST_FORMAT_TIME) {
-        g_mutex_unlock (&timecodestamper->mutex);
+        GST_OBJECT_UNLOCK (timecodestamper);
         GST_ERROR_OBJECT (timecodestamper, "Invalid segment format");
         return FALSE;
       }
@@ -532,7 +342,7 @@ gst_timecodestamper_sink_event (GstBaseTransform * trans, GstEvent * event)
           GST_VIDEO_FORMAT_UNKNOWN) {
         GST_ERROR_OBJECT (timecodestamper,
             "Received segment event without caps");
-        g_mutex_unlock (&timecodestamper->mutex);
+        GST_OBJECT_UNLOCK (timecodestamper);
         return FALSE;
       }
 
@@ -542,8 +352,8 @@ gst_timecodestamper_sink_event (GstBaseTransform * trans, GstEvent * event)
 
         gst_timecodestamper_set_drop_frame (timecodestamper);
 
-        tc = gst_video_time_code_new_from_date_time (timecodestamper->vinfo.
-            fps_n, timecodestamper->vinfo.fps_d, dt,
+        tc = gst_video_time_code_new_from_date_time (timecodestamper->
+            vinfo.fps_n, timecodestamper->vinfo.fps_d, dt,
             timecodestamper->current_tc->config.flags, 0);
 
         g_date_time_unref (dt);
@@ -563,7 +373,7 @@ gst_timecodestamper_sink_event (GstBaseTransform * trans, GstEvent * event)
       tc_str = gst_video_time_code_to_string (timecodestamper->current_tc);
       GST_DEBUG_OBJECT (timecodestamper, "New timecode is %s", tc_str);
       g_free (tc_str);
-      g_mutex_unlock (&timecodestamper->mutex);
+      GST_OBJECT_UNLOCK (timecodestamper);
       if (notify)
         g_object_notify (G_OBJECT (timecodestamper), "first-timecode");
       break;
@@ -572,35 +382,16 @@ gst_timecodestamper_sink_event (GstBaseTransform * trans, GstEvent * event)
     {
       GstCaps *caps;
 
-      g_mutex_lock (&timecodestamper->mutex);
+      GST_OBJECT_LOCK (timecodestamper);
       gst_event_parse_caps (event, &caps);
       if (!gst_video_info_from_caps (&timecodestamper->vinfo, caps)) {
-        g_mutex_unlock (&timecodestamper->mutex);
+        GST_OBJECT_UNLOCK (timecodestamper);
         return FALSE;
       }
-      if (timecodestamper->vinfo.fps_n == 0) {
-        GST_WARNING_OBJECT (timecodestamper,
-            "Non-constant frame rate found. Refusing to create a timecode");
-        g_mutex_unlock (&timecodestamper->mutex);
-        break;
-      }
-
       gst_timecodestamper_reset_timecode (timecodestamper);
-      g_mutex_unlock (&timecodestamper->mutex);
+      GST_OBJECT_UNLOCK (timecodestamper);
       break;
     }
-    case GST_EVENT_FLUSH_START:
-      pad_flushing (timecodestamper);
-      break;
-    case GST_EVENT_FLUSH_STOP:
-      pad_flush_stop (timecodestamper);
-      break;
-    case GST_EVENT_EOS:
-      g_mutex_lock (&timecodestamper->mutex);
-      timecodestamper->no_wait = TRUE;
-      g_cond_signal (&timecodestamper->ltc_cond_audio);
-      g_mutex_unlock (&timecodestamper->mutex);
-      break;
     default:
       break;
   }
@@ -625,158 +416,26 @@ gst_timecodestamper_transform_ip (GstBaseTransform * vfilter,
     GstBuffer * buffer)
 {
   GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (vfilter);
-  GstVideoTimeCode *tc = NULL;
-  GstVideoTimeCodeMeta *tc_meta = NULL;
-
-#if HAVE_LTC
-  GstClockTime frame_runtime, frame_duration;
-#endif
-
-  g_mutex_lock (&timecodestamper->mutex);
-
-  if (timecodestamper->vinfo.fps_n == 0 || timecodestamper->vinfo.fps_d == 0) {
-    g_mutex_unlock (&timecodestamper->mutex);
-    return GST_FLOW_OK;
-  }
-#if HAVE_LTC
-
-  frame_runtime =
-      gst_segment_to_running_time (&vfilter->segment, GST_FORMAT_TIME,
-      GST_BUFFER_PTS (buffer));
-
-  frame_duration = gst_util_uint64_scale_int_ceil (GST_SECOND,
-      timecodestamper->vinfo.fps_d, timecodestamper->vinfo.fps_n);
-
-  if (timecodestamper->ltc_dec) {
-
-    GstClockTime ltc_runtime;
-    SMPTETimecode stc;
-    LTCFrameExt ltc_frame;
-
-    while (!timecodestamper->ltc_intern_tc &&
-        timecodestamper->ltc_audio_endtime < frame_runtime + 2 * frame_duration
-        && timecodestamper->ltc_audio_endtime +
-        timecodestamper->ltc_max_offset >= frame_runtime
-        && !timecodestamper->no_wait) {
-      g_cond_wait (&timecodestamper->ltc_cond_video, &timecodestamper->mutex);
-    }
-
-    if (timecodestamper->is_flushing) {
-      g_mutex_unlock (&timecodestamper->mutex);
-      return GST_FLOW_FLUSHING;
-    }
-
-    while (ltc_decoder_read (timecodestamper->ltc_dec, &ltc_frame) == 1) {
-
-      GstVideoTimeCode ltc_intern_tc;
-      gint fps_n_div;
-
-      ltc_runtime = timecodestamper->ltc_first_runtime +
-          gst_util_uint64_scale (GST_SECOND, ltc_frame.off_start,
-          timecodestamper->audio_info.rate);
-
-      ltc_frame_to_time (&stc, &ltc_frame.ltc, 0);
-      GST_INFO_OBJECT (timecodestamper,
-          "Got LTC timecode %02d:%02d:%02d:%02d", stc.hours, stc.mins,
-          stc.secs, stc.frame);
-      fps_n_div =
-          timecodestamper->vinfo.fps_n / timecodestamper->vinfo.fps_d >
-          30 ? 2 : 1;
-      gst_video_time_code_init (&ltc_intern_tc,
-          timecodestamper->vinfo.fps_n / fps_n_div,
-          timecodestamper->vinfo.fps_d,
-          timecodestamper->current_tc->config.latest_daily_jam,
-          timecodestamper->current_tc->config.flags, stc.hours, stc.mins,
-          stc.secs, stc.frame, 0);
-      gst_video_time_code_add_frames (&ltc_intern_tc, timecodestamper->ltc_add);
-      if (!timecodestamper->ltc_intern_tc
-          || gst_video_time_code_compare (timecodestamper->ltc_intern_tc,
-              &ltc_intern_tc) != 0) {
-        if (timecodestamper->ltc_intern_tc) {
-          gst_video_time_code_free (timecodestamper->ltc_intern_tc);
-          timecodestamper->ltc_intern_tc = NULL;
-        }
-        /* A timecode frame that starts +/- half a frame to the
-         * video frame is considered belonging to that video frame */
-        if (ABSDIFF (frame_runtime + frame_duration / 2, ltc_runtime) <
-            gst_util_uint64_scale_int_ceil (GST_SECOND,
-                timecodestamper->vinfo.fps_d,
-                timecodestamper->vinfo.fps_n * 2)) {
-
-          timecodestamper->ltc_intern_tc =
-              gst_video_time_code_copy (&ltc_intern_tc);
-
-          gst_video_time_code_clear (timecodestamper->ltc_current_tc);
-          gst_video_time_code_init (timecodestamper->ltc_current_tc,
-              timecodestamper->current_tc->config.fps_n,
-              timecodestamper->current_tc->config.fps_d,
-              timecodestamper->current_tc->config.latest_daily_jam,
-              timecodestamper->current_tc->config.flags,
-              stc.hours, stc.mins, stc.secs, stc.frame * fps_n_div, 0);
-          gst_video_time_code_add_frames (timecodestamper->ltc_current_tc,
-              timecodestamper->ltc_add);
-          GST_INFO_OBJECT (timecodestamper, "Resynced internal LTC counter");
-        }
-      } else {
-        gst_video_time_code_increment_frame (timecodestamper->ltc_intern_tc);
-        break;
-      }
-
-      gst_video_time_code_clear (&ltc_intern_tc);
-
-      if (timecodestamper->ltc_intern_tc) {
-        gst_video_time_code_increment_frame (timecodestamper->ltc_intern_tc);
-      }
-    }
-    g_cond_signal (&timecodestamper->ltc_cond_audio);
-  }
-#endif
-
-  switch (timecodestamper->tc_source) {
-    case GST_TIME_CODE_STAMPER_NOREPLACE:
-      tc_meta = gst_buffer_get_video_time_code_meta (buffer);
-      if (tc_meta)
-        tc = gst_video_time_code_copy (&tc_meta->tc);
-      else
-        tc = gst_video_time_code_copy (timecodestamper->current_tc);
-    case GST_TIME_CODE_STAMPER_INTERN:
-      tc = gst_video_time_code_copy (timecodestamper->current_tc);
-      break;
-    case GST_TIME_CODE_STAMPER_EXISTING:
-      tc_meta = gst_buffer_get_video_time_code_meta (buffer);
-      if (tc_meta)
-        tc = gst_video_time_code_copy (&tc_meta->tc);
-      break;
-    case GST_TIME_CODE_STAMPER_LTC:
-      tc = gst_video_time_code_copy (timecodestamper->ltc_current_tc);
-      break;
-    case GST_TIME_CODE_STAMPER_NRZERO:
-      tc_meta = gst_buffer_get_video_time_code_meta (buffer);
-      if (tc_meta) {
-        tc = gst_video_time_code_copy (&tc_meta->tc);
-      } else {
-        GstVideoTimeCode *t = timecodestamper->current_tc;
-        tc = gst_video_time_code_new (t->config.fps_n, t->config.fps_d,
-            g_date_time_ref (t->config.latest_daily_jam),
-            t->config.flags, 0, 0, 0, 0, 0);
-      }
-      break;
-    default:
-      break;
-  }
-
-  if (timecodestamper->tc_source != GST_TIME_CODE_STAMPER_EXISTING && !tc_meta) {
+  GstVideoTimeCodeMeta *tc_meta;
+  GstVideoTimeCode *tc;
+
+  GST_OBJECT_LOCK (timecodestamper);
+  tc_meta = gst_buffer_get_video_time_code_meta (buffer);
+  if (tc_meta && !timecodestamper->override_existing) {
+    GST_OBJECT_UNLOCK (timecodestamper);
+    tc = gst_video_time_code_copy (&tc_meta->tc);
+    goto beach;
+  } else if (timecodestamper->override_existing) {
     gst_buffer_foreach_meta (buffer, remove_timecode_meta, NULL);
-    gst_buffer_add_video_time_code_meta (buffer, tc);
   }
 
+  gst_buffer_add_video_time_code_meta (buffer, timecodestamper->current_tc);
+  tc = gst_video_time_code_copy (timecodestamper->current_tc);
   gst_video_time_code_increment_frame (timecodestamper->current_tc);
-  if (timecodestamper->ltc_intern_tc)
-    gst_video_time_code_increment_frame (timecodestamper->ltc_current_tc);
-
-  g_mutex_unlock (&timecodestamper->mutex);
+  GST_OBJECT_UNLOCK (timecodestamper);
 
-  if (timecodestamper->post_messages && tc) {
+beach:
+  if (timecodestamper->post_messages) {
     GstClockTime stream_time, running_time, duration;
     GstStructure *s;
     GstMessage *msg;
@@ -792,212 +451,11 @@ gst_timecodestamper_transform_ip (GstBaseTransform * vfilter,
         timecodestamper->vinfo.fps_n);
     s = gst_structure_new ("timecodestamper", "timestamp", G_TYPE_UINT64,
         GST_BUFFER_PTS (buffer), "stream-time", G_TYPE_UINT64, stream_time,
-        "running-time", G_TYPE_UINT64, running_time, "duration",
-        G_TYPE_UINT64, duration, "timecode", GST_TYPE_VIDEO_TIME_CODE, tc,
-        NULL);
+        "running-time", G_TYPE_UINT64, running_time, "duration", G_TYPE_UINT64,
+        duration, "timecode", GST_TYPE_VIDEO_TIME_CODE, tc, NULL);
     msg = gst_message_new_element (GST_OBJECT (timecodestamper), s);
     gst_element_post_message (GST_ELEMENT (timecodestamper), msg);
   }
-
-  if (tc)
-    gst_video_time_code_free (tc);
-
+  gst_video_time_code_free (tc);
   return GST_FLOW_OK;
 }
-
-static GstPad *
-gst_timecodestamper_request_new_pad (GstElement * element,
-    GstPadTemplate * templ, const gchar * name_templ, const GstCaps * caps)
-{
-  GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (element);
-
-  timecodestamper->ltcpad = gst_pad_new_from_static_template
-      (&gst_timecodestamper_ltc_template, "ltc");
-
-  gst_pad_set_chain_function (timecodestamper->ltcpad,
-      GST_DEBUG_FUNCPTR (gst_timecodestamper_ltcpad_chain));
-  gst_pad_set_event_function (timecodestamper->ltcpad,
-      GST_DEBUG_FUNCPTR (gst_timecodestamper_ltcpad_event));
-  gst_pad_set_query_function (timecodestamper->ltcpad,
-      GST_DEBUG_FUNCPTR (gst_timecodestamper_ltcpad_query));
-  gst_pad_set_activatemode_function (timecodestamper->ltcpad,
-      GST_DEBUG_FUNCPTR (gst_timecodestamper_pad_activatemode));
-
-  gst_element_add_pad (element, timecodestamper->ltcpad);
-
-  return timecodestamper->ltcpad;
-}
-
-static void
-gst_timecodestamper_release_pad (GstElement * element, GstPad * pad)
-{
-  GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (element);
-
-  if (timecodestamper->ltcpad == pad) {
-    gst_element_remove_pad (element, pad);
-
-    timecodestamper->ltcpad = NULL;
-
-#if HAVE_LTC
-    g_mutex_lock (&timecodestamper->mutex);
-    g_cond_signal (&timecodestamper->ltc_cond_video);
-    g_cond_signal (&timecodestamper->ltc_cond_audio);
-    g_mutex_unlock (&timecodestamper->mutex);
-    ltc_decoder_free (timecodestamper->ltc_dec);
-    timecodestamper->ltc_dec = NULL;
-#endif
-  }
-}
-
-static GstFlowReturn
-gst_timecodestamper_ltcpad_chain (GstPad * pad,
-    GstObject * parent, GstBuffer * buffer)
-{
-#if HAVE_LTC
-
-  GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (parent);
-  GstMapInfo map;
-  GstClockTime brt;
-  GstFlowReturn fr;
-
-  g_mutex_lock (&timecodestamper->mutex);
-
-  brt = gst_segment_to_running_time (&timecodestamper->ltc_segment,
-      GST_FORMAT_TIME, GST_BUFFER_PTS (buffer));
-  if (GST_BUFFER_DURATION (buffer) != GST_CLOCK_TIME_NONE) {
-    timecodestamper->ltc_audio_endtime = brt + GST_BUFFER_DURATION (buffer);
-  } else if (timecodestamper->audio_info.rate > 0) {
-    timecodestamper->ltc_audio_endtime = brt +
-        gst_buffer_get_size (buffer) /
-        GST_AUDIO_INFO_BPF (&timecodestamper->audio_info);
-  }
-
-  if (GST_BUFFER_IS_DISCONT (buffer)) {
-    ltc_decoder_queue_flush (timecodestamper->ltc_dec);
-    timecodestamper->ltc_total = 0;
-  }
-
-  if (timecodestamper->ltc_total == 0) {
-    timecodestamper->ltc_first_runtime = brt;
-  }
-
-  gst_buffer_map (buffer, &map, GST_MAP_READ);
-  ltc_decoder_write (timecodestamper->ltc_dec, map.data, map.size,
-      timecodestamper->ltc_total);
-  timecodestamper->ltc_total += map.size;
-  gst_buffer_unmap (buffer, &map);
-
-  g_cond_signal (&timecodestamper->ltc_cond_video);
-
-  while (ltc_decoder_queue_length (timecodestamper->ltc_dec) >
-      DEFAULT_LTC_QUEUE / 2 && !timecodestamper->no_wait) {
-    g_cond_wait (&timecodestamper->ltc_cond_audio, &timecodestamper->mutex);
-  }
-
-  if (timecodestamper->is_flushing)
-    fr = GST_FLOW_FLUSHING;
-  else
-    fr = GST_FLOW_OK;
-
-  g_mutex_unlock (&timecodestamper->mutex);
-
-#endif
-
-  gst_buffer_unref (buffer);
-  return fr;
-}
-
-static gboolean
-gst_timecodestamper_ltcpad_event (GstPad * pad,
-    GstObject * parent, GstEvent * event)
-{
-#if HAVE_LTC
-  GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (parent);
-
-  GstCaps *caps;
-  gint samples_per_frame = 1920;
-#endif
-
-  gboolean ret = TRUE;
-
-  switch (GST_EVENT_TYPE (event)) {
-#if HAVE_LTC
-    case GST_EVENT_CAPS:
-      gst_event_parse_caps (event, &caps);
-      ret = gst_audio_info_from_caps (&timecodestamper->audio_info, caps);
-      if (ret) {
-        if (timecodestamper->vinfo.fps_n) {
-          samples_per_frame = timecodestamper->audio_info.rate *
-              timecodestamper->vinfo.fps_d / timecodestamper->vinfo.fps_n;
-        }
-      }
-
-      if (!timecodestamper->ltc_dec) {
-        timecodestamper->ltc_dec =
-            ltc_decoder_create (samples_per_frame, DEFAULT_LTC_QUEUE);
-        timecodestamper->ltc_total = 0;
-      }
-
-      break;
-    case GST_EVENT_SEGMENT:
-      gst_event_copy_segment (event, &timecodestamper->ltc_segment);
-      break;
-
-    case GST_EVENT_FLUSH_START:
-      pad_flushing (timecodestamper);
-      break;
-    case GST_EVENT_FLUSH_STOP:
-      pad_flush_stop (timecodestamper);
-      break;
-    case GST_EVENT_EOS:
-      g_mutex_lock (&timecodestamper->mutex);
-      timecodestamper->no_wait = TRUE;
-      g_cond_signal (&timecodestamper->ltc_cond_video);
-      g_mutex_unlock (&timecodestamper->mutex);
-      break;
-#endif
-
-    default:
-      break;
-  }
-
-  gst_event_unref (event);
-  return ret;
-}
-
-static gboolean
-gst_timecodestamper_ltcpad_query (GstPad * pad,
-    GstObject * parent, GstQuery * query)
-{
-  GstCaps *caps, *filter, *tcaps;
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CAPS:
-      gst_query_parse_caps (query, &filter);
-      tcaps = gst_pad_get_pad_template_caps (pad);
-      if (filter)
-        caps = gst_caps_intersect_full (tcaps, filter,
-            GST_CAPS_INTERSECT_FIRST);
-      else
-        caps = gst_caps_ref (tcaps);
-      gst_query_set_caps_result (query, caps);
-      gst_caps_unref (tcaps);
-      gst_caps_unref (caps);
-      return TRUE;
-    default:
-      return FALSE;
-  }
-}
-
-static gboolean
-gst_timecodestamper_pad_activatemode (GstPad * pad,
-    GstObject * parent, GstPadMode mode, gboolean active)
-{
-  GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (parent);
-
-  if (!active) {
-    pad_flushing (timecodestamper);
-  }
-
-  return TRUE;
-}
diff --git a/gst/timecode/gsttimecodestamper.h b/gst/timecode/gsttimecodestamper.h
index 0aa6ea4a6..dd9e7dd59 100644
--- a/gst/timecode/gsttimecodestamper.h
+++ b/gst/timecode/gsttimecodestamper.h
@@ -25,11 +25,6 @@
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
-#include <gst/audio/audio.h>
-
-#if HAVE_LTC
-#include <ltc.h>
-#endif
 
 #define GST_TYPE_TIME_CODE_STAMPER            (gst_timecodestamper_get_type())
 #define GST_TIME_CODE_STAMPER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TIME_CODE_STAMPER,GstTimeCodeStamper))
@@ -38,20 +33,9 @@
 #define GST_IS_TIME_CODE_STAMPER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TIME_CODE_STAMPER))
 #define GST_IS_TIME_CODE_STAMPER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_TIME_CODE_STAMPER))
 
-#define GST_TYPE_TIME_CODE_STAMPER_SOURCE (gst_timecodestamper_source_get_type())
-
 typedef struct _GstTimeCodeStamper GstTimeCodeStamper;
 typedef struct _GstTimeCodeStamperClass GstTimeCodeStamperClass;
 
-typedef enum GstTimeCodeStamperSource
-{
-  GST_TIME_CODE_STAMPER_NOREPLACE,
-  GST_TIME_CODE_STAMPER_INTERN,
-  GST_TIME_CODE_STAMPER_EXISTING,
-  GST_TIME_CODE_STAMPER_LTC,
-  GST_TIME_CODE_STAMPER_NRZERO
-} GstTimeCodeStamperSource;
-
 /**
  * GstTimeCodeStamper:
  *
@@ -61,34 +45,14 @@ struct _GstTimeCodeStamper
 {
   GstBaseTransform videofilter;
 
-  GstPad *ltcpad;
-
   /* < private > */
-  GstTimeCodeStamperSource tc_source;
+  gboolean override_existing;
   gboolean drop_frame;
   GstVideoTimeCode *current_tc;
   GstVideoTimeCode *first_tc;
-  GstVideoTimeCode *ltc_current_tc;
-  GstVideoTimeCode *ltc_intern_tc;
-  GstClockTime ltc_max_offset;
-  gint ltc_add;
-  GstSegment ltc_segment;
   GstVideoInfo vinfo;
   gboolean post_messages;
   gboolean first_tc_now;
-  gboolean is_flushing;
-  gboolean no_wait;
-  GMutex mutex;
-
-#if HAVE_LTC
-  LTCDecoder *ltc_dec;
-  ltc_off_t ltc_total;
-  GstAudioInfo audio_info;
-  GstClockTime ltc_first_runtime;
-  GstClockTime ltc_audio_endtime;
-  GCond ltc_cond_video;
-  GCond ltc_cond_audio;
-#endif
 };
 
 struct _GstTimeCodeStamperClass
@@ -98,7 +62,5 @@ struct _GstTimeCodeStamperClass
 
 GType gst_timecodestamper_get_type (void);
 
-GType gst_timecodestamper_source_get_type (void);
-
 G_END_DECLS
 #endif /* __GST_TIME_CODE_STAMPER_H__ */