diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-12-17 17:54:09 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-12-17 18:41:41 +0100 |
| commit | d4c4af699eb3a728e84add8c4ea413e4f5d8c75c (patch) | |
| tree | edcb06389e82912a7b8681ddf2bb092c26f59df2 /gst/compositor | |
| parent | e82ec368630a2a5052b16a210569b62d9805f76d (diff) | |
| download | gstreamer-plugins-bad-d4c4af699eb3a728e84add8c4ea413e4f5d8c75c.tar.gz | |
aggregator: Add a timeout parameter to ::aggregate()
When this is TRUE, we really have to produce output. This happens
in live mixing mode when we have to output something for the current
time, no matter if we have enough input or not.
Diffstat (limited to 'gst/compositor')
| -rw-r--r-- | gst/compositor/compositor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c index 04d01a14c..c5d09011c 100644 --- a/gst/compositor/compositor.c +++ b/gst/compositor/compositor.c @@ -280,6 +280,9 @@ gst_compositor_pad_prepare_frame (GstVideoAggregatorPad * pad, static GstAllocationParams params = { 0, 15, 0, 0, }; gint width, height; + if (!pad->buffer) + return TRUE; + if (!gst_video_frame_map (frame, &pad->buffer_vinfo, pad->buffer, GST_MAP_READ)) { GST_WARNING_OBJECT (vagg, "Could not map input buffer"); |