Commit bbed5a5f authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

Fix indentation

parent 57e1e592
......@@ -1641,7 +1641,7 @@ gst_x_image_sink_set_window_handle (GstVideoOverlay * overlay, guintptr id)
if (xwindow) {
ximagesink->xwindow = xwindow;
/* Update the window geometry, possibly generating a reconfigure event. */
gst_x_image_sink_xwindow_update_geometry(ximagesink);
gst_x_image_sink_xwindow_update_geometry (ximagesink);
}
g_mutex_unlock (&ximagesink->flow_lock);
......
......@@ -94,7 +94,7 @@ gst_audio_decoder_tester_start (GstAudioDecoder * dec)
static gboolean
gst_audio_decoder_tester_stop (GstAudioDecoder * dec)
{
GstAudioDecoderTester *tester = (GstAudioDecoderTester *)dec;
GstAudioDecoderTester *tester = (GstAudioDecoderTester *) dec;
if (tester->prev_buf) {
gst_buffer_unref (tester->prev_buf);
tester->prev_buf = NULL;
......@@ -1047,18 +1047,19 @@ GST_END_TEST;
GST_START_TEST (audiodecoder_plc_on_gap_event)
{
/* GstAudioDecoder should not mark the stream DISCOUNT flag when
concealed audio eliminate discontinuity. More important it should not
mess with the timestamps */
concealed audio eliminate discontinuity. More important it should not
mess with the timestamps */
GstClockTime pts;
GstClockTime dur = gst_util_uint64_scale_round (1, GST_SECOND, TEST_MSECS_PER_SAMPLE);
GstClockTime dur =
gst_util_uint64_scale_round (1, GST_SECOND, TEST_MSECS_PER_SAMPLE);
GstBuffer *buf;
GstHarness *h = setup_audiodecodertester (NULL, NULL);
gst_audio_decoder_set_plc_aware (GST_AUDIO_DECODER (h->element), TRUE);
gst_audio_decoder_set_plc (GST_AUDIO_DECODER (h->element), TRUE);
pts = gst_util_uint64_scale_round (0, GST_SECOND, TEST_MSECS_PER_SAMPLE);
gst_harness_push (h, create_test_buffer(0));
gst_harness_push (h, create_test_buffer (0));
buf = gst_harness_pull (h);
fail_unless_equals_int (pts, GST_BUFFER_PTS (buf));
fail_unless_equals_int (dur, GST_BUFFER_DURATION (buf));
......@@ -1074,7 +1075,7 @@ GST_START_TEST (audiodecoder_plc_on_gap_event)
gst_buffer_unref (buf);
pts = gst_util_uint64_scale_round (2, GST_SECOND, TEST_MSECS_PER_SAMPLE);
buf = create_test_buffer(2);
buf = create_test_buffer (2);
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT);
gst_harness_push (h, buf);
buf = gst_harness_pull (h);
......@@ -1084,35 +1085,37 @@ GST_START_TEST (audiodecoder_plc_on_gap_event)
gst_buffer_unref (buf);
gst_harness_teardown (h);
}
GST_END_TEST;
GST_START_TEST (audiodecoder_plc_on_gap_event_with_delay)
{
/* The same thing as in audiodecoder_plc_on_gap_event, but GstAudioDecoder
subclass delays the decoding
*/
subclass delays the decoding
*/
GstClockTime pts0, pts1;
GstClockTime dur = gst_util_uint64_scale_round (1, GST_SECOND, TEST_MSECS_PER_SAMPLE);
GstClockTime dur =
gst_util_uint64_scale_round (1, GST_SECOND, TEST_MSECS_PER_SAMPLE);
GstBuffer *buf;
GstHarness *h = setup_audiodecodertester (NULL, NULL);
gst_audio_decoder_set_plc_aware (GST_AUDIO_DECODER (h->element), TRUE);
gst_audio_decoder_set_plc (GST_AUDIO_DECODER (h->element), TRUE);
pts0 = gst_util_uint64_scale_round (0, GST_SECOND, TEST_MSECS_PER_SAMPLE);;
gst_harness_push (h, create_test_buffer(0));
gst_harness_push (h, create_test_buffer (0));
buf = gst_harness_pull (h);
fail_unless_equals_int (pts0, GST_BUFFER_PTS (buf));
fail_unless_equals_int (dur, GST_BUFFER_DURATION (buf));
fail_unless (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DISCONT));
gst_buffer_unref (buf);
((GstAudioDecoderTester *)h->element)->delay_decoding = TRUE;
((GstAudioDecoderTester *) h->element)->delay_decoding = TRUE;
pts0 = gst_util_uint64_scale_round (1, GST_SECOND, TEST_MSECS_PER_SAMPLE);
gst_harness_push_event (h, gst_event_new_gap (pts0, dur));
fail_unless_equals_int (0, gst_harness_buffers_in_queue (h));
pts1 = gst_util_uint64_scale_round (2, GST_SECOND, TEST_MSECS_PER_SAMPLE);
buf = create_test_buffer(2);
buf = create_test_buffer (2);
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT);
gst_harness_push (h, buf);
buf = gst_harness_pull (h);
......@@ -1128,6 +1131,7 @@ GST_START_TEST (audiodecoder_plc_on_gap_event_with_delay)
gst_buffer_unref (buf);
gst_harness_teardown (h);
}
GST_END_TEST;
static Suite *
......
......@@ -47,6 +47,7 @@
#include <gst/check/gstcheck.h>
#include <gst/sdp/gstsdpmessage.h>
/* *INDENT-OFF* */
static const gchar *sdp = "v=0\r\n"
"o=- 123456 0 IN IP4 127.0.0.1\r\n"
"s=TestSessionToCopy\r\n"
......@@ -59,7 +60,9 @@ static const gchar *sdp = "v=0\r\n"
"a=sendrecv\r\n"
"m=video 6565 RTP/AVP 98\r\n"
"a=rtpmap:98 VP8/90000\r\n"
"a=sendrecv\r\n" "m=audio 4545 RTP/AVP 14\r\n" "a=sendrecv\r\n"
"a=sendrecv\r\n"
"m=audio 4545 RTP/AVP 14\r\n"
"a=sendrecv\r\n"
"m=audio 1010 TCP 14\r\n";
static const gchar caps_video_string1[] =
......@@ -120,7 +123,8 @@ static const gchar *sdp_rtcp_fb_all = "v=0\r\n"
"a=rtcp-fb:* nack pli\r\n"
"a=rtcp-fb:100 ccm fir\r\n"
"a=rtpmap:101 VP9/90000\r\n"
"a=rtcp-fb:101 ccm fir\r\n" "a=rtpmap:102 H264/90000\r\n";
"a=rtcp-fb:101 ccm fir\r\n"
"a=rtpmap:102 H264/90000\r\n";
static const gchar caps_video_rtcp_fb_all_pt_100[] =
"application/x-unknown, media=(string)video, payload=(int)100, "
......@@ -139,6 +143,7 @@ static const gchar caps_video_rtcp_fb_all_pt_102[] =
"clock-rate=(int)90000, encoding-name=(string)H264, "
"rtcp-fb-nack=(boolean)true, rtcp-fb-nack-pli=(boolean)true";
/* *INDENT-ON* */
GST_START_TEST (boxed)
{
......
......@@ -1082,22 +1082,17 @@ GST_END_TEST;
static const gchar *test_default_caps[][2] = {
{
"video/x-test-custom",
"video/x-raw, format=I420, width=1280, height=720, framerate=0/1"
}, {
"video/x-test-custom, width=1000",
"video/x-raw, format=I420, width=1000, height=720, framerate=0/1"
}, {
"video/x-test-custom, height=500",
"video/x-raw, format=I420, width=1280, height=500, framerate=0/1"
}, {
"video/x-test-custom, framerate=10/1",
"video/x-raw, format=I420, width=1280, height=720, framerate=10/1"
}, {
"video/x-test-custom, pixel-aspect-ratio=2/1",
"video/x-raw, format=I420, width=1280, height=720, framerate=0/1,"
"pixel-aspect-ratio=2/1"
}
"video/x-test-custom",
"video/x-raw, format=I420, width=1280, height=720, framerate=0/1"}, {
"video/x-test-custom, width=1000",
"video/x-raw, format=I420, width=1000, height=720, framerate=0/1"}, {
"video/x-test-custom, height=500",
"video/x-raw, format=I420, width=1280, height=500, framerate=0/1"}, {
"video/x-test-custom, framerate=10/1",
"video/x-raw, format=I420, width=1280, height=720, framerate=10/1"}, {
"video/x-test-custom, pixel-aspect-ratio=2/1",
"video/x-raw, format=I420, width=1280, height=720, framerate=0/1,"
"pixel-aspect-ratio=2/1"}
};
GST_START_TEST (videodecoder_default_caps_on_gap_before_buffer)
......
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