mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-19 08:11:16 +00:00
fa1805d531
When schedule is true (as is the case by default), we insert padding when no caption data is present in the schedule queue, and previously weren't checking whether the caption pad had gone EOS, leading to infinite scheduling of padding after EOS on the caption pad. Rectify that by adding a "drain" parameter to dequeue_caption() In addition, update the captions_and_eos test to push valid cc_data in: without this cccombiner was attaching padding buffers it had generated itself, and with that patch would now stop attaching said padding to the second buffer. By pushing valid, non-padding cc_data we ensure a caption buffer is indeed attached to the first and second video buffers. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1252>
208 lines
6.3 KiB
C
208 lines
6.3 KiB
C
/* GStreamer
|
|
*
|
|
* Copyright (C) 2018 Sebastian Dröge <sebastian@centricular.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
* Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
#include <gst/gst.h>
|
|
#include <gst/check/gstcheck.h>
|
|
#include <gst/check/gstharness.h>
|
|
#include <gst/video/video.h>
|
|
|
|
#include <string.h>
|
|
|
|
static GstStaticCaps foo_bar_caps = GST_STATIC_CAPS ("foo/bar");
|
|
static GstStaticCaps cea708_cc_data_caps =
|
|
GST_STATIC_CAPS ("closedcaption/x-cea-708,format=(string) cc_data");
|
|
|
|
GST_START_TEST (no_captions)
|
|
{
|
|
GstHarness *h;
|
|
GstBuffer *buf, *outbuf;
|
|
GstCaps *caps;
|
|
|
|
h = gst_harness_new_with_padnames ("cccombiner", "sink", "src");
|
|
|
|
gst_harness_set_src_caps_str (h, foo_bar_caps.string);
|
|
|
|
buf = gst_buffer_new_and_alloc (128);
|
|
GST_BUFFER_PTS (buf) = 0;
|
|
GST_BUFFER_DURATION (buf) = 40 * GST_MSECOND;
|
|
outbuf = gst_harness_push_and_pull (h, gst_buffer_ref (buf));
|
|
|
|
fail_unless (outbuf != NULL);
|
|
fail_unless (outbuf == buf);
|
|
|
|
caps = gst_pad_get_current_caps (h->sinkpad);
|
|
fail_unless (caps != NULL);
|
|
fail_unless (gst_caps_can_intersect (caps,
|
|
gst_static_caps_get (&foo_bar_caps)));
|
|
gst_caps_unref (caps);
|
|
|
|
gst_buffer_unref (buf);
|
|
gst_buffer_unref (outbuf);
|
|
|
|
gst_harness_teardown (h);
|
|
}
|
|
|
|
GST_END_TEST;
|
|
|
|
GstBuffer *expected_video_buffer = NULL;
|
|
GstBuffer *expected_caption_buffer = NULL;
|
|
|
|
static void
|
|
samples_selected_cb (GstAggregator * agg, GstSegment * segment,
|
|
GstClockTime pts, GstClockTime dts, GstClockTime duration,
|
|
GstStructure * info, gpointer user_data)
|
|
{
|
|
GstBufferList *buflist;
|
|
GstPad *caption_pad =
|
|
gst_element_get_static_pad (GST_ELEMENT (agg), "caption");
|
|
GstPad *video_pad = gst_element_get_static_pad (GST_ELEMENT (agg), "sink");
|
|
GstSample *video_sample =
|
|
gst_aggregator_peek_next_sample (agg, GST_AGGREGATOR_PAD (video_pad));
|
|
GstSample *captions_sample =
|
|
gst_aggregator_peek_next_sample (agg, GST_AGGREGATOR_PAD (caption_pad));
|
|
|
|
fail_unless (video_sample != NULL);
|
|
fail_unless (captions_sample != NULL);
|
|
|
|
fail_unless (gst_sample_get_buffer (video_sample) == expected_video_buffer);
|
|
gst_sample_unref (video_sample);
|
|
|
|
buflist = gst_sample_get_buffer_list (captions_sample);
|
|
fail_unless_equals_int (gst_buffer_list_length (buflist), 1);
|
|
gst_sample_unref (captions_sample);
|
|
|
|
gst_object_unref (caption_pad);
|
|
gst_object_unref (video_pad);
|
|
}
|
|
|
|
GST_START_TEST (captions_and_eos)
|
|
{
|
|
GstHarness *h, *h2;
|
|
GstBuffer *buf, *outbuf;
|
|
GstPad *caption_pad;
|
|
GstCaps *caps;
|
|
GstVideoCaptionMeta *meta;
|
|
GstBuffer *second_video_buf, *second_caption_buf;
|
|
const guint8 cc_data[3] = { 0xfc, 0x20, 0x20 };
|
|
|
|
h = gst_harness_new_with_padnames ("cccombiner", "sink", "src");
|
|
h2 = gst_harness_new_with_element (h->element, NULL, NULL);
|
|
caption_pad = gst_element_request_pad_simple (h->element, "caption");
|
|
gst_harness_add_element_sink_pad (h2, caption_pad);
|
|
gst_object_unref (caption_pad);
|
|
|
|
g_object_set (h->element, "emit-signals", TRUE, NULL);
|
|
g_signal_connect (h->element, "samples-selected",
|
|
G_CALLBACK (samples_selected_cb), NULL);
|
|
|
|
gst_harness_set_src_caps_str (h, foo_bar_caps.string);
|
|
gst_harness_set_src_caps_str (h2, cea708_cc_data_caps.string);
|
|
|
|
/* Push a buffer and caption buffer */
|
|
buf = gst_buffer_new_and_alloc (128);
|
|
GST_BUFFER_PTS (buf) = 0;
|
|
GST_BUFFER_DURATION (buf) = 40 * GST_MSECOND;
|
|
expected_video_buffer = buf;
|
|
gst_harness_push (h, buf);
|
|
|
|
buf = gst_buffer_new_and_alloc (3);
|
|
gst_buffer_fill (buf, 0, cc_data, 3);
|
|
GST_BUFFER_PTS (buf) = 0;
|
|
GST_BUFFER_DURATION (buf) = 40 * GST_MSECOND;
|
|
expected_caption_buffer = buf;
|
|
gst_harness_push (h2, buf);
|
|
|
|
/* And another one: the first video buffer should be retrievable
|
|
* after the second caption buffer is pushed */
|
|
buf = gst_buffer_new_and_alloc (128);
|
|
GST_BUFFER_PTS (buf) = 40 * GST_MSECOND;
|
|
GST_BUFFER_DURATION (buf) = 40 * GST_MSECOND;
|
|
second_video_buf = buf;
|
|
gst_harness_push (h, buf);
|
|
|
|
buf = gst_buffer_new_and_alloc (3);
|
|
gst_buffer_fill (buf, 0, cc_data, 3);
|
|
GST_BUFFER_PTS (buf) = 40 * GST_MSECOND;
|
|
GST_BUFFER_DURATION (buf) = 40 * GST_MSECOND;
|
|
second_caption_buf = buf;
|
|
gst_harness_push (h2, buf);
|
|
|
|
/* Pull the first output buffer */
|
|
outbuf = gst_harness_pull (h);
|
|
fail_unless (outbuf != NULL);
|
|
|
|
expected_video_buffer = second_video_buf;
|
|
expected_caption_buffer = second_caption_buf;
|
|
|
|
meta = gst_buffer_get_video_caption_meta (outbuf);
|
|
fail_unless (meta != NULL);
|
|
fail_unless_equals_int (meta->caption_type,
|
|
GST_VIDEO_CAPTION_TYPE_CEA708_RAW);
|
|
fail_unless_equals_int (meta->size, 3);
|
|
|
|
gst_buffer_unref (outbuf);
|
|
|
|
/* Push EOS on both pads get the second output buffer, we otherwise wait
|
|
* in case there are further captions for the current video buffer */
|
|
gst_harness_push_event (h, gst_event_new_eos ());
|
|
gst_harness_push_event (h2, gst_event_new_eos ());
|
|
|
|
outbuf = gst_harness_pull (h);
|
|
fail_unless (outbuf != NULL);
|
|
|
|
meta = gst_buffer_get_video_caption_meta (outbuf);
|
|
fail_unless (meta != NULL);
|
|
fail_unless_equals_int (meta->caption_type,
|
|
GST_VIDEO_CAPTION_TYPE_CEA708_RAW);
|
|
fail_unless_equals_int (meta->size, 3);
|
|
|
|
gst_buffer_unref (outbuf);
|
|
|
|
/* Caps should be equal to input caps */
|
|
caps = gst_pad_get_current_caps (h->sinkpad);
|
|
fail_unless (caps != NULL);
|
|
fail_unless (gst_caps_can_intersect (caps,
|
|
gst_static_caps_get (&foo_bar_caps)));
|
|
gst_caps_unref (caps);
|
|
|
|
gst_harness_teardown (h);
|
|
gst_harness_teardown (h2);
|
|
}
|
|
|
|
GST_END_TEST;
|
|
|
|
static Suite *
|
|
cccombiner_suite (void)
|
|
{
|
|
Suite *s = suite_create ("cccombiner");
|
|
TCase *tc = tcase_create ("general");
|
|
|
|
suite_add_tcase (s, tc);
|
|
|
|
tcase_add_test (tc, no_captions);
|
|
tcase_add_test (tc, captions_and_eos);
|
|
|
|
return s;
|
|
}
|
|
|
|
GST_CHECK_MAIN (cccombiner);
|