tests: hlsdemux: add test for updating segment stop

Add a test for seeking that only updates stop position and verifies
that start is unmodified
This commit is contained in:
Thiago Santos 2016-01-07 15:21:40 -03:00
parent 16a2f7f5c0
commit a4980a33a1
2 changed files with 57 additions and 48 deletions

View File

@ -299,13 +299,15 @@ testSeekAdaptiveDemuxSendsData (GstAdaptiveDemuxTestEngine * engine,
testData->test_task == NULL && testData->test_task == NULL &&
(stream->total_received_size + stream->segment_received_size) >= (stream->total_received_size + stream->segment_received_size) >=
testData->threshold_for_seek) { testData->threshold_for_seek) {
GstSeekFlags seek_flags;
testData->threshold_for_seek = testData->threshold_for_seek =
stream->total_received_size + stream->segment_received_size; stream->total_received_size + stream->segment_received_size;
/* the seek will be to the beginning of the file, so expect to receive gst_event_parse_seek (testData->seek_event, NULL, NULL, &seek_flags, NULL,
* threshold_for_seek + a whole file NULL, NULL, NULL);
*/ if (seek_flags & GST_SEEK_FLAG_FLUSH)
testOutputStreamData->expected_size += testData->threshold_for_seek; testOutputStreamData->expected_size += testData->threshold_for_seek;
GST_DEBUG ("starting seek task"); GST_DEBUG ("starting seek task");
@ -324,23 +326,25 @@ testSeekAdaptiveDemuxSendsData (GstAdaptiveDemuxTestEngine * engine,
GST_DEBUG ("seek task started"); GST_DEBUG ("seek task started");
g_mutex_lock (&testData->test_task_state_lock); if (seek_flags & GST_SEEK_FLAG_FLUSH) {
g_mutex_lock (&testData->test_task_state_lock);
GST_DEBUG ("waiting for seek task to change state on testsrc"); GST_DEBUG ("waiting for seek task to change state on testsrc");
/* wait for test_task to run, send a flush start event to AppSink /* wait for test_task to run, send a flush start event to AppSink
* and change the testhttpsrc element state from PLAYING to PAUSED * and change the testhttpsrc element state from PLAYING to PAUSED
*/ */
while (testData->test_task_state == while (testData->test_task_state ==
TEST_TASK_STATE_WAITING_FOR_TESTSRC_STATE_CHANGE) { TEST_TASK_STATE_WAITING_FOR_TESTSRC_STATE_CHANGE) {
g_cond_wait (&testData->test_task_state_cond, g_cond_wait (&testData->test_task_state_cond,
&testData->test_task_state_lock); &testData->test_task_state_lock);
}
g_mutex_unlock (&testData->test_task_state_lock);
/* we can continue now, but this buffer will be rejected by AppSink
* because it is in flushing mode
*/
GST_DEBUG ("seek task changed state on testsrc, resuming");
} }
g_mutex_unlock (&testData->test_task_state_lock);
/* we can continue now, but this buffer will be rejected by AppSink
* because it is in flushing mode
*/
GST_DEBUG ("seek task changed state on testsrc, resuming");
} }
return TRUE; return TRUE;
@ -365,25 +369,17 @@ testSeekAdaptiveAppSinkEvent (GstAdaptiveDemuxTestEngine * engine,
&& gst_event_get_seqnum (event) == && gst_event_get_seqnum (event) ==
gst_event_get_seqnum (testData->seek_event)) { gst_event_get_seqnum (testData->seek_event)) {
const GstSegment *seek_segment; const GstSegment *seek_segment;
GstSeekType start_type, stop_type;
gst_event_parse_seek (testData->seek_event, NULL, NULL, NULL, &start_type,
NULL, &stop_type, NULL);
gst_event_parse_segment (event, &seek_segment); gst_event_parse_segment (event, &seek_segment);
fail_unless (seek_segment->format == fail_unless (seek_segment->format ==
testOutputStreamData->post_seek_segment.format); testOutputStreamData->post_seek_segment.format);
fail_unless (seek_segment->rate == fail_unless (seek_segment->rate ==
testOutputStreamData->post_seek_segment.rate); testOutputStreamData->post_seek_segment.rate);
if (start_type != GST_SEEK_TYPE_NONE) { fail_unless (seek_segment->start ==
fail_unless (seek_segment->start == testOutputStreamData->post_seek_segment.start);
testOutputStreamData->post_seek_segment.start); fail_unless (seek_segment->stop ==
} testOutputStreamData->post_seek_segment.stop);
if (stop_type != GST_SEEK_TYPE_NONE) {
fail_unless (seek_segment->stop ==
testOutputStreamData->post_seek_segment.stop);
}
fail_unless (seek_segment->base == fail_unless (seek_segment->base ==
testOutputStreamData->post_seek_segment.base); testOutputStreamData->post_seek_segment.base);
fail_unless (seek_segment->time == fail_unless (seek_segment->time ==

View File

@ -394,7 +394,8 @@ GST_START_TEST (testSeek)
GST_END_TEST; GST_END_TEST;
static void static void
run_seek_position_test (gdouble rate, guint64 seek_start, GstSeekType stop_type, run_seek_position_test (gdouble rate, GstSeekType start_type,
guint64 seek_start, GstSeekType stop_type,
guint64 seek_stop, GstSeekFlags flags, guint64 segment_start, guint64 seek_stop, GstSeekFlags flags, guint64 segment_start,
guint64 segment_stop, gint segments) guint64 segment_stop, gint segments)
{ {
@ -436,7 +437,7 @@ run_seek_position_test (gdouble rate, guint64 seek_start, GstSeekType stop_type,
/* Seek to 1.5s, expect it to start from 1s */ /* Seek to 1.5s, expect it to start from 1s */
engineTestData->threshold_for_seek = 20 * TS_PACKET_LEN; engineTestData->threshold_for_seek = 20 * TS_PACKET_LEN;
engineTestData->seek_event = engineTestData->seek_event =
gst_event_new_seek (rate, GST_FORMAT_TIME, flags, GST_SEEK_TYPE_SET, gst_event_new_seek (rate, GST_FORMAT_TIME, flags, start_type,
seek_start, stop_type, seek_stop); seek_start, stop_type, seek_stop);
gst_segment_init (&outputTestData[0].post_seek_segment, GST_FORMAT_TIME); gst_segment_init (&outputTestData[0].post_seek_segment, GST_FORMAT_TIME);
outputTestData[0].post_seek_segment.rate = rate; outputTestData[0].post_seek_segment.rate = rate;
@ -457,8 +458,9 @@ GST_START_TEST (testSeekKeyUnitPosition)
{ {
/* Seek to 1.5s with key unit, it should go back to 1.0s. 3 segments will be /* Seek to 1.5s with key unit, it should go back to 1.0s. 3 segments will be
* pushed */ * pushed */
run_seek_position_test (1.0, 1500 * GST_MSECOND, GST_SEEK_TYPE_NONE, 0, run_seek_position_test (1.0, GST_SEEK_TYPE_SET, 1500 * GST_MSECOND,
GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, 1000 * GST_MSECOND, -1, 3); GST_SEEK_TYPE_NONE, 0, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT,
1000 * GST_MSECOND, -1, 3);
} }
GST_END_TEST; GST_END_TEST;
@ -468,8 +470,16 @@ GST_START_TEST (testSeekPosition)
/* Seek to 1.5s without key unit, it should keep the 1.5s, but still push /* Seek to 1.5s without key unit, it should keep the 1.5s, but still push
* from the 1st segment, so 3 segments will be * from the 1st segment, so 3 segments will be
* pushed */ * pushed */
run_seek_position_test (1.0, 1500 * GST_MSECOND, GST_SEEK_TYPE_NONE, 0, run_seek_position_test (1.0, GST_SEEK_TYPE_SET, 1500 * GST_MSECOND,
GST_SEEK_FLAG_FLUSH, 1500 * GST_MSECOND, -1, 3); GST_SEEK_TYPE_NONE, 0, GST_SEEK_FLAG_FLUSH, 1500 * GST_MSECOND, -1, 3);
}
GST_END_TEST;
GST_START_TEST (testSeekUpdateStopPosition)
{
run_seek_position_test (1.0, GST_SEEK_TYPE_NONE, 1500 * GST_MSECOND,
GST_SEEK_TYPE_SET, 3000 * GST_MSECOND, 0, 0, 3000 * GST_MSECOND, 3);
} }
GST_END_TEST; GST_END_TEST;
@ -477,9 +487,9 @@ GST_END_TEST;
GST_START_TEST (testSeekSnapBeforePosition) GST_START_TEST (testSeekSnapBeforePosition)
{ {
/* Seek to 1.5s, snap before, it go to 1s */ /* Seek to 1.5s, snap before, it go to 1s */
run_seek_position_test (1.0, 1500 * GST_MSECOND, GST_SEEK_TYPE_NONE, 0, run_seek_position_test (1.0, GST_SEEK_TYPE_SET, 1500 * GST_MSECOND,
GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SNAP_BEFORE, 1000 * GST_MSECOND, -1, GST_SEEK_TYPE_NONE, 0, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SNAP_BEFORE,
3); 1000 * GST_MSECOND, -1, 3);
} }
GST_END_TEST; GST_END_TEST;
@ -488,9 +498,9 @@ GST_END_TEST;
GST_START_TEST (testSeekSnapAfterPosition) GST_START_TEST (testSeekSnapAfterPosition)
{ {
/* Seek to 1.5s with snap after, it should move to 2s */ /* Seek to 1.5s with snap after, it should move to 2s */
run_seek_position_test (1.0, 1500 * GST_MSECOND, GST_SEEK_TYPE_NONE, 0, run_seek_position_test (1.0, GST_SEEK_TYPE_SET, 1500 * GST_MSECOND,
GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SNAP_AFTER, 2000 * GST_MSECOND, -1, GST_SEEK_TYPE_NONE, 0, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SNAP_AFTER,
2); 2000 * GST_MSECOND, -1, 2);
} }
GST_END_TEST; GST_END_TEST;
@ -498,9 +508,10 @@ GST_END_TEST;
GST_START_TEST (testReverseSeekSnapBeforePosition) GST_START_TEST (testReverseSeekSnapBeforePosition)
{ {
run_seek_position_test (-1.0, 1000 * GST_MSECOND, GST_SEEK_TYPE_SET, run_seek_position_test (-1.0, GST_SEEK_TYPE_SET, 1000 * GST_MSECOND,
2500 * GST_MSECOND, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SNAP_BEFORE, GST_SEEK_TYPE_SET, 2500 * GST_MSECOND,
1000 * GST_MSECOND, 3000 * GST_MSECOND, 2); GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SNAP_BEFORE, 1000 * GST_MSECOND,
3000 * GST_MSECOND, 2);
} }
GST_END_TEST; GST_END_TEST;
@ -508,9 +519,10 @@ GST_END_TEST;
GST_START_TEST (testReverseSeekSnapAfterPosition) GST_START_TEST (testReverseSeekSnapAfterPosition)
{ {
run_seek_position_test (-1.0, 1000 * GST_MSECOND, GST_SEEK_TYPE_SET, run_seek_position_test (-1.0, GST_SEEK_TYPE_SET, 1000 * GST_MSECOND,
2500 * GST_MSECOND, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SNAP_AFTER, GST_SEEK_TYPE_SET, 2500 * GST_MSECOND,
1000 * GST_MSECOND, 2000 * GST_MSECOND, 1); GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_SNAP_AFTER, 1000 * GST_MSECOND,
2000 * GST_MSECOND, 1);
} }
GST_END_TEST; GST_END_TEST;
@ -714,6 +726,7 @@ hls_demux_suite (void)
tcase_add_test (tc_basicTest, testSeek); tcase_add_test (tc_basicTest, testSeek);
tcase_add_test (tc_basicTest, testSeekKeyUnitPosition); tcase_add_test (tc_basicTest, testSeekKeyUnitPosition);
tcase_add_test (tc_basicTest, testSeekPosition); tcase_add_test (tc_basicTest, testSeekPosition);
tcase_add_test (tc_basicTest, testSeekUpdateStopPosition);
tcase_add_test (tc_basicTest, testSeekSnapBeforePosition); tcase_add_test (tc_basicTest, testSeekSnapBeforePosition);
tcase_add_test (tc_basicTest, testSeekSnapAfterPosition); tcase_add_test (tc_basicTest, testSeekSnapAfterPosition);
tcase_add_test (tc_basicTest, testReverseSeekSnapBeforePosition); tcase_add_test (tc_basicTest, testReverseSeekSnapBeforePosition);