mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "decklink: Detect gaps on incoming stream times, issue warnings"

Browse source 
This reverts commit c1294e10f9.

Was not ready to be pushed yet.
This commit is contained in:
Vivia Nikolaidou 2017-11-07 21:12:42 +02:00
parent ccc1624d09
commit 07819afda4
4 changed files with 0 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
sys/decklink/gstdecklinkaudiosrc.cpp
View file

@ -36,10 +36,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_decklink_audio_src_debug);
#define DEFAULT_DISCONT_WAIT (1 * GST_SECOND) #define DEFAULT_DISCONT_WAIT (1 * GST_SECOND)
#define DEFAULT_CHANNELS (GST_DECKLINK_AUDIO_CHANNELS_2) #define DEFAULT_CHANNELS (GST_DECKLINK_AUDIO_CHANNELS_2)
#ifndef ABSDIFF
#define ABSDIFF(x, y) ( (x) > (y) ? ((x) - (y)) : ((y) - (x)) )
#endif
enum enum
{ {
PROP_0, PROP_0,
@ -705,44 +701,6 @@ retry:
self->info.rate) - timestamp; self->info.rate) - timestamp;
} }
// Detect gaps in stream time
self->processed += sample_count;
if (p.stream_timestamp != GST_CLOCK_TIME_NONE) {
GstClockTime start_stream_time, end_stream_time;
start_stream_time = p.stream_timestamp;
start_offset =
gst_util_uint64_scale (start_stream_time, self->info.rate, GST_SECOND);
end_offset = start_offset + sample_count;
end_stream_time = gst_util_uint64_scale_int (end_offset, GST_SECOND,
self->info.rate);
if (self->expected_stream_time != GST_CLOCK_TIME_NONE &&
ABSDIFF (self->expected_stream_time, p.stream_timestamp) >
gst_util_uint64_scale (2, GST_SECOND, self->info.rate)) {
GstMessage *msg;
GstClockTime running_time;
self->dropped +=
gst_util_uint64_scale (ABSDIFF (self->expected_stream_time,
p.stream_timestamp), self->info.rate, GST_SECOND);
running_time =
gst_segment_to_running_time (&GST_BASE_SRC (self)->segment,
GST_FORMAT_TIME, timestamp);
msg =
gst_message_new_qos (GST_OBJECT (self), TRUE, running_time, p.stream_timestamp,
timestamp, duration);
gst_message_set_qos_stats (msg, GST_FORMAT_DEFAULT, self->processed,
self->dropped);
gst_element_post_message (GST_ELEMENT (self), msg);
}
self->expected_stream_time = end_stream_time;
}
if (p.no_signal) if (p.no_signal)
GST_BUFFER_FLAG_SET (*buffer, GST_BUFFER_FLAG_GAP); GST_BUFFER_FLAG_SET (*buffer, GST_BUFFER_FLAG_GAP);
GST_BUFFER_TIMESTAMP (*buffer) = timestamp; GST_BUFFER_TIMESTAMP (*buffer) = timestamp;
@ -949,9 +907,6 @@ gst_decklink_audio_src_change_state (GstElement * element,
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
self->processed = 0;
self->dropped = 0;
self->expected_stream_time = GST_CLOCK_TIME_NONE;
if (!gst_decklink_audio_src_open (self)) { if (!gst_decklink_audio_src_open (self)) {
ret = GST_STATE_CHANGE_FAILURE; ret = GST_STATE_CHANGE_FAILURE;
goto out; goto out;

5
sys/decklink/gstdecklinkaudiosrc.h
View file

@ -71,11 +71,6 @@ struct _GstDecklinkAudioSrc
/* counter to keep track of timestamps */ /* counter to keep track of timestamps */
guint64 next_offset; guint64 next_offset;
/* detect gaps in stream time */
GstClockTime expected_stream_time;
guint64 processed;
guint64 dropped;
/* Last time we noticed a discont */ /* Last time we noticed a discont */
GstClockTime discont_time; GstClockTime discont_time;

28
sys/decklink/gstdecklinkvideosrc.cpp
View file

@ -36,10 +36,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_decklink_video_src_debug);
#define DEFAULT_SKIP_FIRST_TIME (0) #define DEFAULT_SKIP_FIRST_TIME (0)
#define DEFAULT_DROP_NO_SIGNAL_FRAMES (FALSE) #define DEFAULT_DROP_NO_SIGNAL_FRAMES (FALSE)
#ifndef ABSDIFF
#define ABSDIFF(x, y) ( (x) > (y) ? ((x) - (y)) : ((y) - (x)) )
#endif
enum enum
{ {
PROP_0, PROP_0,
@ -836,26 +832,6 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
} }
} }
if (self->expected_stream_time != GST_CLOCK_TIME_NONE &&
ABSDIFF (self->expected_stream_time, f.stream_timestamp) > 1) {
GstMessage *msg;
GstClockTime running_time;
self->dropped += f.stream_timestamp - self->expected_stream_time;
running_time = gst_segment_to_running_time (&GST_BASE_SRC (self)->segment,
GST_FORMAT_TIME, f.timestamp);
msg = gst_message_new_qos (GST_OBJECT (self), TRUE, running_time, f.stream_timestamp,
f.timestamp, f.duration);
gst_message_set_qos_stats (msg, GST_FORMAT_TIME, self->processed,
self->dropped);
gst_element_post_message (GST_ELEMENT (self), msg);
}
if (self->first_stream_time == GST_CLOCK_TIME_NONE)
self->first_stream_time = f.stream_timestamp;
self->processed = f.stream_timestamp - self->dropped - self->first_stream_time;
self->expected_stream_time = f.stream_timestamp + f.stream_duration;
g_mutex_unlock (&self->lock); g_mutex_unlock (&self->lock);
if (caps_changed) { if (caps_changed) {
caps = gst_decklink_mode_get_caps (f.mode, f.format, TRUE); caps = gst_decklink_mode_get_caps (f.mode, f.format, TRUE);
@ -1111,10 +1087,6 @@ gst_decklink_video_src_change_state (GstElement * element,
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
self->processed = 0;
self->dropped = 0;
self->expected_stream_time = GST_CLOCK_TIME_NONE;
self->first_stream_time = GST_CLOCK_TIME_NONE;
if (!gst_decklink_video_src_open (self)) { if (!gst_decklink_video_src_open (self)) {
ret = GST_STATE_CHANGE_FAILURE; ret = GST_STATE_CHANGE_FAILURE;
goto out; goto out;

4
sys/decklink/gstdecklinkvideosrc.h
View file

@ -58,10 +58,6 @@ struct _GstDecklinkVideoSrc
gboolean output_stream_time; gboolean output_stream_time;
GstClockTime skip_first_time; GstClockTime skip_first_time;
gboolean drop_no_signal_frames; gboolean drop_no_signal_frames;
GstClockTime expected_stream_time;
guint64 processed;
guint64 dropped;
guint64 first_stream_time;
GstVideoInfo info; GstVideoInfo info;
GstDecklinkVideoFormat video_format; GstDecklinkVideoFormat video_format;