Commit ec90bbb6 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

decklink: Add property for configuring the buffer size of the sources

parent 112fdd26
......@@ -28,7 +28,7 @@
GST_DEBUG_CATEGORY_STATIC (gst_decklink_audio_src_debug);
#define GST_CAT_DEFAULT gst_decklink_audio_src_debug
#define MAX_QUEUE_LENGTH 5
#define DEFAULT_BUFFER_SIZE (5)
#define DEFAULT_ALIGNMENT_THRESHOLD (40 * GST_MSECOND)
#define DEFAULT_DISCONT_WAIT (1 * GST_SECOND)
......@@ -38,7 +38,8 @@ enum
PROP_0,
PROP_DEVICE_NUMBER,
PROP_ALIGNMENT_THRESHOLD,
PROP_DISCONT_WAIT
PROP_DISCONT_WAIT,
PROP_BUFFER_SIZE
};
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("src",
......@@ -154,6 +155,12 @@ gst_decklink_audio_src_class_init (GstDecklinkAudioSrcClass * klass)
G_MAXUINT64 - 1, DEFAULT_DISCONT_WAIT,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
g_object_class_install_property (gobject_class, PROP_BUFFER_SIZE,
g_param_spec_uint ("buffer-size", "Buffer Size",
"Size of internal buffer in number of video frames", 1,
G_MAXINT, DEFAULT_BUFFER_SIZE,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&sink_template));
......@@ -171,6 +178,7 @@ gst_decklink_audio_src_init (GstDecklinkAudioSrc * self)
self->device_number = 0;
self->alignment_threshold = DEFAULT_ALIGNMENT_THRESHOLD;
self->discont_wait = DEFAULT_DISCONT_WAIT;
self->buffer_size = DEFAULT_BUFFER_SIZE;
gst_base_src_set_live (GST_BASE_SRC (self), TRUE);
gst_base_src_set_format (GST_BASE_SRC (self), GST_FORMAT_TIME);
......@@ -197,6 +205,9 @@ gst_decklink_audio_src_set_property (GObject * object, guint property_id,
case PROP_DISCONT_WAIT:
self->discont_wait = g_value_get_uint64 (value);
break;
case PROP_BUFFER_SIZE:
self->buffer_size = g_value_get_uint (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
......@@ -219,6 +230,9 @@ gst_decklink_audio_src_get_property (GObject * object, guint property_id,
case PROP_DISCONT_WAIT:
g_value_set_uint64 (value, self->discont_wait);
break;
case PROP_BUFFER_SIZE:
g_value_set_uint (value, self->buffer_size);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
......@@ -314,7 +328,7 @@ gst_decklink_audio_src_got_packet (GstElement * element,
if (!self->flushing) {
CapturePacket *p;
while (g_queue_get_length (&self->current_packets) >= MAX_QUEUE_LENGTH) {
while (g_queue_get_length (&self->current_packets) >= self->buffer_size) {
p = (CapturePacket *) g_queue_pop_head (&self->current_packets);
GST_WARNING_OBJECT (self, "Dropping old packet at %" GST_TIME_FORMAT,
GST_TIME_ARGS (p->capture_time));
......@@ -440,9 +454,12 @@ gst_decklink_audio_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
} else {
// No discont, just keep counting
self->discont_time = GST_CLOCK_TIME_NONE;
timestamp = gst_util_uint64_scale (self->next_offset, GST_SECOND, self->info.rate);
timestamp =
gst_util_uint64_scale (self->next_offset, GST_SECOND, self->info.rate);
self->next_offset += sample_count;
duration = gst_util_uint64_scale (self->next_offset, GST_SECOND, self->info.rate) - timestamp;
duration =
gst_util_uint64_scale (self->next_offset, GST_SECOND,
self->info.rate) - timestamp;
}
GST_BUFFER_TIMESTAMP (*buffer) = timestamp;
......@@ -469,7 +486,7 @@ gst_decklink_audio_src_query (GstBaseSrc * bsrc, GstQuery * query)
min =
gst_util_uint64_scale_ceil (GST_MSECOND, self->input->mode->fps_d,
self->input->mode->fps_n);
max = MAX_QUEUE_LENGTH * min;
max = self->buffer_size * min;
gst_query_set_latency (query, TRUE, min, max);
ret = TRUE;
......
......@@ -70,6 +70,8 @@ struct _GstDecklinkAudioSrc
/* Last time we noticed a discont */
GstClockTime discont_time;
guint buffer_size;
};
struct _GstDecklinkAudioSrcClass
......
......@@ -28,13 +28,14 @@
GST_DEBUG_CATEGORY_STATIC (gst_decklink_video_src_debug);
#define GST_CAT_DEFAULT gst_decklink_video_src_debug
#define MAX_QUEUE_LENGTH 5
#define DEFAULT_BUFFER_SIZE (5)
enum
{
PROP_0,
PROP_MODE,
PROP_DEVICE_NUMBER
PROP_DEVICE_NUMBER,
PROP_BUFFER_SIZE
};
typedef struct
......@@ -134,6 +135,12 @@ gst_decklink_video_src_class_init (GstDecklinkVideoSrcClass * klass)
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
G_PARAM_CONSTRUCT)));
g_object_class_install_property (gobject_class, PROP_BUFFER_SIZE,
g_param_spec_uint ("buffer-size", "Buffer Size",
"Size of internal buffer in number of video frames", 1,
G_MAXINT, DEFAULT_BUFFER_SIZE,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
templ_caps = gst_decklink_mode_get_template_caps ();
gst_element_class_add_pad_template (element_class,
gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, templ_caps));
......@@ -152,6 +159,7 @@ gst_decklink_video_src_init (GstDecklinkVideoSrc * self)
{
self->mode = GST_DECKLINK_MODE_NTSC;
self->device_number = 0;
self->buffer_size = DEFAULT_BUFFER_SIZE;
gst_base_src_set_live (GST_BASE_SRC (self), TRUE);
gst_base_src_set_format (GST_BASE_SRC (self), GST_FORMAT_TIME);
......@@ -175,6 +183,9 @@ gst_decklink_video_src_set_property (GObject * object, guint property_id,
case PROP_DEVICE_NUMBER:
self->device_number = g_value_get_int (value);
break;
case PROP_BUFFER_SIZE:
self->buffer_size = g_value_get_uint (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
......@@ -194,6 +205,9 @@ gst_decklink_video_src_get_property (GObject * object, guint property_id,
case PROP_DEVICE_NUMBER:
g_value_set_int (value, self->device_number);
break;
case PROP_BUFFER_SIZE:
g_value_set_uint (value, self->buffer_size);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
......@@ -242,7 +256,7 @@ gst_decklink_video_src_got_frame (GstElement * element,
if (!self->flushing) {
CaptureFrame *f;
while (g_queue_get_length (&self->current_frames) >= MAX_QUEUE_LENGTH) {
while (g_queue_get_length (&self->current_frames) >= self->buffer_size) {
f = (CaptureFrame *) g_queue_pop_head (&self->current_frames);
GST_WARNING_OBJECT (self, "Dropping old frame at %" GST_TIME_FORMAT,
GST_TIME_ARGS (f->capture_time));
......@@ -334,7 +348,7 @@ gst_decklink_video_src_query (GstBaseSrc * bsrc, GstQuery * query)
min =
gst_util_uint64_scale_ceil (GST_MSECOND, mode->fps_d, mode->fps_n);
max = MAX_QUEUE_LENGTH * min;
max = self->buffer_size * min;
gst_query_set_latency (query, TRUE, min, max);
ret = TRUE;
......
......@@ -60,6 +60,8 @@ struct _GstDecklinkVideoSrc
GMutex lock;
gboolean flushing;
GQueue current_frames;
guint buffer_size;
};
struct _GstDecklinkVideoSrcClass
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment