mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "decklinkvideo/audiosrc: Add GstReferenceTimestampMeta with the stream time to each buffer"

Browse source 
This reverts commit d5684d5b14.

This shouldn't have been merged before 1.12.
This commit is contained in:
Sebastian Dröge 2017-04-19 19:08:41 +01:00
parent d5684d5b14
commit 0a4717ea20
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/decklink/gstdecklinkaudiosrc.cpp
View file

@ -61,7 +61,6 @@ typedef struct
{ {
IDeckLinkAudioInputPacket *packet; IDeckLinkAudioInputPacket *packet;
GstClockTime timestamp; GstClockTime timestamp;
GstClockTime stream_timestamp;
gboolean no_signal; gboolean no_signal;
} CapturePacket; } CapturePacket;
@ -532,7 +531,6 @@ gst_decklink_audio_src_got_packet (GstElement * element,
memset (&p, 0, sizeof (p)); memset (&p, 0, sizeof (p));
p.packet = packet; p.packet = packet;
p.timestamp = timestamp; p.timestamp = timestamp;
p.stream_timestamp = packet_time;
p.no_signal = no_signal; p.no_signal = no_signal;
packet->AddRef (); packet->AddRef ();
gst_queue_array_push_tail_struct (self->current_packets, &p); 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; GstClockTime start_time, end_time;
guint64 start_offset, end_offset; guint64 start_offset, end_offset;
gboolean discont = FALSE; gboolean discont = FALSE;
static GstStaticCaps stream_reference =
GST_STATIC_CAPS ("timestamp/x-stream");
retry: retry:
g_mutex_lock (&self->lock); g_mutex_lock (&self->lock);
@ -671,10 +667,6 @@ retry:
GST_BUFFER_TIMESTAMP (*buffer) = timestamp; GST_BUFFER_TIMESTAMP (*buffer) = timestamp;
GST_BUFFER_DURATION (*buffer) = duration; 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, GST_DEBUG_OBJECT (self,
"Outputting buffer %p with timestamp %" GST_TIME_FORMAT " and duration %" "Outputting buffer %p with timestamp %" GST_TIME_FORMAT " and duration %"
GST_TIME_FORMAT, *buffer, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (*buffer)), GST_TIME_FORMAT, *buffer, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (*buffer)),

9
sys/decklink/gstdecklinkvideosrc.cpp
View file

@ -55,8 +55,6 @@ typedef struct
{ {
IDeckLinkVideoInputFrame *frame; IDeckLinkVideoInputFrame *frame;
GstClockTime timestamp, duration; GstClockTime timestamp, duration;
GstClockTime stream_timestamp;
GstClockTime stream_duration;
GstDecklinkModeEnum mode; GstDecklinkModeEnum mode;
BMDPixelFormat format; BMDPixelFormat format;
GstVideoTimeCode *tc; GstVideoTimeCode *tc;
@ -686,8 +684,6 @@ gst_decklink_video_src_got_frame (GstElement * element,
f.frame = frame; f.frame = frame;
f.timestamp = timestamp; f.timestamp = timestamp;
f.duration = duration; f.duration = duration;
f.stream_timestamp = stream_time;
f.stream_duration = stream_duration;
f.mode = mode; f.mode = mode;
f.format = frame->GetPixelFormat (); f.format = frame->GetPixelFormat ();
f.no_signal = no_signal; f.no_signal = no_signal;
@ -747,8 +743,6 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
GstCaps *caps; GstCaps *caps;
gboolean caps_changed = FALSE; gboolean caps_changed = FALSE;
const GstDecklinkMode *mode; const GstDecklinkMode *mode;
static GstStaticCaps stream_reference =
GST_STATIC_CAPS ("timestamp/x-stream");
g_mutex_lock (&self->lock); g_mutex_lock (&self->lock);
while (gst_queue_array_is_empty (self->current_frames) && !self->flushing) { 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; GST_BUFFER_DURATION (*buffer) = f.duration;
if (f.tc != NULL) if (f.tc != NULL)
gst_buffer_add_video_time_code_meta (*buffer, f.tc); 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); mode = gst_decklink_get_mode (self->mode);
if (mode->interlaced && mode->tff) if (mode->interlaced && mode->tff)