From 0a4717ea2022369470b86681afa40313e3e3e363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 19 Apr 2017 19:08:41 +0100 Subject: Revert "decklinkvideo/audiosrc: Add GstReferenceTimestampMeta with the stream time to each buffer" This reverts commit d5684d5b145a3eb0e23476f18669d1ffa552c5de. This shouldn't have been merged before 1.12. --- sys/decklink/gstdecklinkaudiosrc.cpp | 8 -------- sys/decklink/gstdecklinkvideosrc.cpp | 9 --------- 2 files changed, 17 deletions(-) diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp index f1dc2d605..43c2d4236 100644 --- a/sys/decklink/gstdecklinkaudiosrc.cpp +++ b/sys/decklink/gstdecklinkaudiosrc.cpp @@ -61,7 +61,6 @@ typedef struct { IDeckLinkAudioInputPacket *packet; GstClockTime timestamp; - GstClockTime stream_timestamp; gboolean no_signal; } CapturePacket; @@ -532,7 +531,6 @@ gst_decklink_audio_src_got_packet (GstElement * element, memset (&p, 0, sizeof (p)); p.packet = packet; p.timestamp = timestamp; - p.stream_timestamp = packet_time; p.no_signal = no_signal; packet->AddRef (); gst_queue_array_push_tail_struct (self->current_packets, &p); @@ -555,8 +553,6 @@ gst_decklink_audio_src_create (GstPushSrc * bsrc, GstBuffer ** buffer) GstClockTime start_time, end_time; guint64 start_offset, end_offset; gboolean discont = FALSE; - static GstStaticCaps stream_reference = - GST_STATIC_CAPS ("timestamp/x-stream"); retry: g_mutex_lock (&self->lock); @@ -671,10 +667,6 @@ retry: GST_BUFFER_TIMESTAMP (*buffer) = timestamp; GST_BUFFER_DURATION (*buffer) = duration; - gst_buffer_add_reference_timestamp_meta (*buffer, - gst_static_caps_get (&stream_reference), p->stream_timestamp, - end_time - start_time); - GST_DEBUG_OBJECT (self, "Outputting buffer %p with timestamp %" GST_TIME_FORMAT " and duration %" GST_TIME_FORMAT, *buffer, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (*buffer)), diff --git a/sys/decklink/gstdecklinkvideosrc.cpp b/sys/decklink/gstdecklinkvideosrc.cpp index 34c716f51..5f3ff75a8 100644 --- a/sys/decklink/gstdecklinkvideosrc.cpp +++ b/sys/decklink/gstdecklinkvideosrc.cpp @@ -55,8 +55,6 @@ typedef struct { IDeckLinkVideoInputFrame *frame; GstClockTime timestamp, duration; - GstClockTime stream_timestamp; - GstClockTime stream_duration; GstDecklinkModeEnum mode; BMDPixelFormat format; GstVideoTimeCode *tc; @@ -686,8 +684,6 @@ gst_decklink_video_src_got_frame (GstElement * element, f.frame = frame; f.timestamp = timestamp; f.duration = duration; - f.stream_timestamp = stream_time; - f.stream_duration = stream_duration; f.mode = mode; f.format = frame->GetPixelFormat (); f.no_signal = no_signal; @@ -747,8 +743,6 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer) GstCaps *caps; gboolean caps_changed = FALSE; const GstDecklinkMode *mode; - static GstStaticCaps stream_reference = - GST_STATIC_CAPS ("timestamp/x-stream"); g_mutex_lock (&self->lock); while (gst_queue_array_is_empty (self->current_frames) && !self->flushing) { @@ -846,9 +840,6 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer) GST_BUFFER_DURATION (*buffer) = f.duration; if (f.tc != NULL) gst_buffer_add_video_time_code_meta (*buffer, f.tc); - gst_buffer_add_reference_timestamp_meta (*buffer, - gst_static_caps_get (&stream_reference), f.stream_timestamp, - f.stream_duration); mode = gst_decklink_get_mode (self->mode); if (mode->interlaced && mode->tff) -- cgit v1.2.1