Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
shaka-packager/packager/media/chunking/text_chunker_unittest.cc

587 lines
22 KiB
C++
Raw Normal View History

Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
// Copyright 2017 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "packager/media/base/media_handler_test_base.h"
Rename WebVttSegmenter To TextChunker Renamed the webvtt segmenter to text chunker as there is nothing webvtt specific in the code. Change-Id: I0111c50d545fa168d945b39bc8a78c46c62678be
2018-03-23 22:28:30 +00:00
#include "packager/media/chunking/text_chunker.h"
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
#include "packager/status_test_util.h"
namespace shaka {
namespace media {
namespace {
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const uint64_t kStreamIndex = 0;
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
const uint64_t kMsTimeScale = 1000u;
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const size_t kInputs = 1;
const size_t kOutputs = 1;
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const size_t kInput = 0;
const size_t kOutput = 0;
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
const bool kEncrypted = true;
const bool kSubSegment = true;
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const int64_t kTick = 50;
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const char* kNoId = "";
const char* kNoSettings = "";
const char* kNoPayload = "";
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
} // namespace
Rename WebVttSegmenter To TextChunker Renamed the webvtt segmenter to text chunker as there is nothing webvtt specific in the code. Change-Id: I0111c50d545fa168d945b39bc8a78c46c62678be
2018-03-23 22:28:30 +00:00
class TextChunkerTest : public MediaHandlerTestBase {
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
protected:
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
void Init(int64_t segment_duration) {
ASSERT_OK(SetUpAndInitializeGraph(
std::make_shared<TextChunker>(segment_duration), kInputs, kOutputs));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
};
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
// S0 S1
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
// | |
// |[---A---]|
// | |
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
TEST_F(TextChunkerTest, SampleEndingOnSegmentStart) {
const int64_t kSegmentStart = 0;
const int64_t kSegmentDuration = kTick;
const int64_t kSampleStart = 0;
const int64_t kSampleDuration = kTick;
const int64_t kSampleEnd = kSampleStart + kSampleDuration;
Init(kSegmentDuration);
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
{
testing::InSequence s;
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnProcess(IsStreamInfo(kStreamIndex)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSampleStart, kSampleEnd,
kNoSettings, kNoPayload)));
Changed Text Segmenter to output segment info last To better align with the Chunking Handler, the Text Segmenter now outputs the SegmentInfo at the end of the segment rather than the start. Change-Id: If69ab951947d00779b4b63a52c4b6662bbdc4c0d
2018-01-02 21:58:47 +00:00
EXPECT_CALL(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegmentStart, kSegmentDuration,
Change Text Sample to Use int64_t Changed Text Sample to use int64_t so that it will use the same type for time as Media Sample. Change-Id: I4cfbfdc60c37bb511517993976cd1a459bdf6667
2018-03-26 18:04:09 +00:00
!kSubSegment, !kEncrypted)));
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnFlush(kStreamIndex));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromStreamInfo(
kStreamIndex, GetTextStreamInfo(kMsTimeScale))));
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kNoId, kSampleStart, kSampleEnd, kNoPayload))));
ASSERT_OK(Input(kInput)->FlushAllDownstreams());
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
// S0 S1 S2
// | | |
// |[-A-] | |
// | |[-B-] |
// | | |
TEST_F(TextChunkerTest, CreatesSegmentsForSamples) {
const int64_t kSegmentDuration = 2 * kTick;
const int64_t kSegment0Start = 0;
const int64_t kSegment1Start = kSegment0Start + kSegmentDuration;
const int64_t kSample0Start = 0;
const int64_t kSample0Duration = kTick;
const int64_t kSample0End = kSample0Start + kSample0Duration;
const int64_t kSample1Start = 3 * kTick;
const int64_t kSample1Duration = kTick;
const int64_t kSample1End = kSample1Start + kSample1Duration;
Init(kSegmentDuration);
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
{
testing::InSequence s;
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnProcess(IsStreamInfo(kStreamIndex)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
// Segment One
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
EXPECT_CALL(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment0Start, kSegmentDuration,
Change Text Sample to Use int64_t Changed Text Sample to use int64_t so that it will use the same type for time as Media Sample. Change-Id: I4cfbfdc60c37bb511517993976cd1a459bdf6667
2018-03-26 18:04:09 +00:00
!kSubSegment, !kEncrypted)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
// Segment Two
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample1Start, kSample1End,
kNoSettings, kNoPayload)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
EXPECT_CALL(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment1Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnFlush(kStreamIndex));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromStreamInfo(
kStreamIndex, GetTextStreamInfo(kMsTimeScale))));
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kNoId, kSample0Start, kSample0End, kNoPayload))));
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kNoId, kSample1Start, kSample1End, kNoPayload))));
ASSERT_OK(Input(kInput)->FlushAllDownstreams());
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
// S0 S1 S2 S3
// | | | |
// |[-A-] | | |
// | | |[-B-] |
// | | | |
Rename WebVttSegmenter To TextChunker Renamed the webvtt segmenter to text chunker as there is nothing webvtt specific in the code. Change-Id: I0111c50d545fa168d945b39bc8a78c46c62678be
2018-03-23 22:28:30 +00:00
TEST_F(TextChunkerTest, OutputsEmptySegments) {
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const int64_t kSegmentDuration = 2 * kTick;
const int64_t kSegment0Start = 0;
const int64_t kSegment1Start = kSegment0Start + kSegmentDuration;
Output Empty WebVTT Text Segments Have the text webvtt pipeline output empty segments rather than skipping them. Bug: #324 Change-Id: I175cf22b65b241f6bf566aba2440518f3df95277
2018-02-05 19:16:00 +00:00
const int64_t kSegment2Start = kSegment1Start + kSegmentDuration;
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const int64_t kSample0Start = 0;
const int64_t kSample0Duration = kTick;
const int64_t kSample0End = kSample0Start + kSample0Duration;
const int64_t kSample1Start = 4 * kTick;
const int64_t kSample1Duration = kTick;
const int64_t kSample1End = kSample1Start + kSample1Duration;
Init(kSegmentDuration);
Output Empty WebVTT Text Segments Have the text webvtt pipeline output empty segments rather than skipping them. Bug: #324 Change-Id: I175cf22b65b241f6bf566aba2440518f3df95277
2018-02-05 19:16:00 +00:00
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
{
testing::InSequence s;
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnProcess(IsStreamInfo(kStreamIndex)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
// Segment One
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
EXPECT_CALL(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment0Start, kSegmentDuration,
Output Empty WebVTT Text Segments Have the text webvtt pipeline output empty segments rather than skipping them. Bug: #324 Change-Id: I175cf22b65b241f6bf566aba2440518f3df95277
2018-02-05 19:16:00 +00:00
!kSubSegment, !kEncrypted)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
Output Empty WebVTT Text Segments Have the text webvtt pipeline output empty segments rather than skipping them. Bug: #324 Change-Id: I175cf22b65b241f6bf566aba2440518f3df95277
2018-02-05 19:16:00 +00:00
// Segment Two (empty segment)
EXPECT_CALL(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment1Start, kSegmentDuration,
Output Empty WebVTT Text Segments Have the text webvtt pipeline output empty segments rather than skipping them. Bug: #324 Change-Id: I175cf22b65b241f6bf566aba2440518f3df95277
2018-02-05 19:16:00 +00:00
!kSubSegment, !kEncrypted)));
// Segment Three
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample1Start, kSample1End,
kNoSettings, kNoPayload)));
Output Empty WebVTT Text Segments Have the text webvtt pipeline output empty segments rather than skipping them. Bug: #324 Change-Id: I175cf22b65b241f6bf566aba2440518f3df95277
2018-02-05 19:16:00 +00:00
EXPECT_CALL(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment2Start, kSegmentDuration,
Output Empty WebVTT Text Segments Have the text webvtt pipeline output empty segments rather than skipping them. Bug: #324 Change-Id: I175cf22b65b241f6bf566aba2440518f3df95277
2018-02-05 19:16:00 +00:00
!kSubSegment, !kEncrypted)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnFlush(kStreamIndex));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromStreamInfo(
kStreamIndex, GetTextStreamInfo(kMsTimeScale))));
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kNoId, kSample0Start, kSample0End, kNoPayload))));
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kNoId, kSample1Start, kSample1End, kNoPayload))));
ASSERT_OK(Input(kInput)->FlushAllDownstreams());
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
// S0 S1 S2
// | | |
// | [---A---] |
// | | |
TEST_F(TextChunkerTest, SampleCrossesSegments) {
const int64_t kSegmentDuration = 2 * kTick;
const int64_t kSegment0Start = 0;
const int64_t kSegment1Start = kSegment0Start + kSegmentDuration;
const int64_t kSampleStart = kTick;
const int64_t kSampleDuration = 2 * kTick;
const int64_t kSampleEnd = kSampleStart + kSampleDuration;
Init(kSegmentDuration);
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
{
testing::InSequence s;
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnProcess(IsStreamInfo(kStreamIndex)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
// Segment One
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSampleStart, kSampleEnd,
kNoSettings, kNoPayload)));
Changed Text Segmenter to output segment info last To better align with the Chunking Handler, the Text Segmenter now outputs the SegmentInfo at the end of the segment rather than the start. Change-Id: If69ab951947d00779b4b63a52c4b6662bbdc4c0d
2018-01-02 21:58:47 +00:00
EXPECT_CALL(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment0Start, kSegmentDuration,
Change Text Sample to Use int64_t Changed Text Sample to use int64_t so that it will use the same type for time as Media Sample. Change-Id: I4cfbfdc60c37bb511517993976cd1a459bdf6667
2018-03-26 18:04:09 +00:00
!kSubSegment, !kEncrypted)));
Changed Text Segmenter to output segment info last To better align with the Chunking Handler, the Text Segmenter now outputs the SegmentInfo at the end of the segment rather than the start. Change-Id: If69ab951947d00779b4b63a52c4b6662bbdc4c0d
2018-01-02 21:58:47 +00:00
// Segment Two
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSampleStart, kSampleEnd,
kNoSettings, kNoPayload)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
EXPECT_CALL(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment1Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnFlush(kStreamIndex));
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromStreamInfo(
kStreamIndex, GetTextStreamInfo(kMsTimeScale))));
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kNoId, kSampleStart, kSampleEnd, kNoPayload))));
ASSERT_OK(Input(kInput)->FlushAllDownstreams());
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
}
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
// S0 S1 S2 S3
// | | | |
// | [-A----|----] | |
// | [-B----|----] | |
// | [-C----|----------|----] |
// | | | |
TEST_F(TextChunkerTest, PreservesOrder) {
const int64_t kSegmentDuration = 2 * kTick;
const int64_t kSegment0Start = 0;
const int64_t kSegment1Start = kSegment0Start + kSegmentDuration;
const int64_t kSegment2Start = kSegment1Start + kSegmentDuration;
const int64_t kSample0Start = kTick;
const int64_t kSample0Duration = 2 * kTick;
const int64_t kSample0End = kSample0Start + kSample0Duration;
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const int64_t kSample1Start = kTick;
const int64_t kSample1Duration = 2 * kTick;
const int64_t kSample1End = kSample1Start + kSample1Duration;
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const int64_t kSample2Start = kTick;
const int64_t kSample2Duration = 4 * kTick;
const int64_t kSample2End = kSample2Start + kSample2Duration;
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
const char* kSample0Id = "sample 0";
const char* kSample1Id = "sample 1";
const char* kSample2Id = "sample 2";
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
Init(kSegmentDuration);
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
{
testing::InSequence s;
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnProcess(IsStreamInfo(kStreamIndex)));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
// Segment One
EXPECT_CALL(*Output(kOutput),
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
OnProcess(IsTextSample(kSample0Id, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kSample1Id, kSample1Start, kSample1End,
kNoSettings, kNoPayload)));
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kSample2Id, kSample2Start, kSample2End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment0Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
// Segment Two
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kSample0Id, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
EXPECT_CALL(*Output(kOutput),
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
OnProcess(IsTextSample(kSample1Id, kSample1Start, kSample1End,
kNoSettings, kNoPayload)));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
EXPECT_CALL(*Output(kOutput),
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
OnProcess(IsTextSample(kSample2Id, kSample2Start, kSample2End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment1Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
// Segment Two
EXPECT_CALL(*Output(kOutput),
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
OnProcess(IsTextSample(kSample2Id, kSample2Start, kSample2End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment2Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
EXPECT_CALL(*Output(kOutput), OnFlush(kStreamIndex));
}
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromStreamInfo(
kStreamIndex, GetTextStreamInfo(kMsTimeScale))));
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kSample0Id, kSample0Start, kSample0End, kNoPayload))));
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kSample1Id, kSample1Start, kSample1End, kNoPayload))));
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kSample2Id, kSample2Start, kSample2End, kNoPayload))));
ASSERT_OK(Input(kInput)->FlushAllDownstreams());
}
// S0 S1 S2 S3 S4 S5
// | | | | | |
// | [--|-----|--A--|-----|--] |
// | | [--|--B--|--] | |
// | | | | | |
TEST_F(TextChunkerTest, NestedSamples) {
const int64_t kSegmentDuration = 2 * kTick;
const int64_t kSample0Start = 1 * kTick;
const int64_t kSample0Duration = 8 * kTick;
const int64_t kSample0End = kSample0Start + kSample0Duration;
const int64_t kSample1Start = 3 * kTick;
const int64_t kSample1Duration = 4 * kTick;
const int64_t kSample1End = kSample1Start + kSample1Duration;
const int64_t kSegment0Start = 0;
const int64_t kSegment1Start = kSegment0Start + kSegmentDuration;
const int64_t kSegment2Start = kSegment1Start + kSegmentDuration;
const int64_t kSegment3Start = kSegment2Start + kSegmentDuration;
const int64_t kSegment4Start = kSegment3Start + kSegmentDuration;
Init(kSegmentDuration);
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutput), OnProcess(IsStreamInfo(kStreamIndex)));
// Segment 0
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment0Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
// Segment 1
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample1Start, kSample1End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment1Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
// Segment 2
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample1Start, kSample1End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment2Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
// Segment 3
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample1Start, kSample1End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment3Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
// Segment 4
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment4Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
EXPECT_CALL(*Output(kOutput), OnFlush(kStreamIndex));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
}
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromStreamInfo(
kStreamIndex, GetTextStreamInfo(kMsTimeScale))));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
kStreamIndex,
GetTextSample(kNoId, kSample0Start, kSample0End, kNoPayload))));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
kStreamIndex,
GetTextSample(kNoId, kSample1Start, kSample1End, kNoPayload))));
ASSERT_OK(Input(kInput)->FlushAllDownstreams());
}
// S0 S1 S2 S3
// | | | |
// | [------A--------]| |
// | | |[--B--] |
// | | | |
TEST_F(TextChunkerTest, SecondSampleStartsAfterMultiSegmentSampleEnds) {
const int64_t kSegmentDuration = 2 * kTick;
const int64_t kSegment0Start = 0;
const int64_t kSegment1Start = kSegment0Start + kSegmentDuration;
const int64_t kSegment2Start = kSegment1Start + kSegmentDuration;
const int64_t kSample0Start = kTick;
const int64_t kSample0Duration = 3 * kTick;
const int64_t kSample0End = kSample0Start + kSample0Duration;
const int64_t kSample1Start = 4 * kTick;
const int64_t kSample1Duration = kTick;
const int64_t kSample1End = kSample1Start + kSample1Duration;
Init(kSegmentDuration);
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutput), OnProcess(IsStreamInfo(kStreamIndex)));
// Segment One
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment0Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
// Segment Two
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample0Start, kSample0End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment1Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
// Segment Three
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSample1Start, kSample1End,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment2Start, kSegmentDuration,
!kSubSegment, !kEncrypted)));
EXPECT_CALL(*Output(kOutput), OnFlush(kStreamIndex));
}
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromStreamInfo(
kStreamIndex, GetTextStreamInfo(kMsTimeScale))));
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kNoId, kSample0Start, kSample0End, kNoPayload))));
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
kStreamIndex,
GetTextSample(kNoId, kSample1Start, kSample1End, kNoPayload))));
ASSERT_OK(Input(kInput)->FlushAllDownstreams());
}
// S0 C0 C1 S1 * *
// s0 s1 s2 * * s3
// | | | |
// | [---|-----A----|---] |
// | | | |
// The segment duration is 8 ticks, but with the cues being injected, c0 will
// become s1, c1 will become s3, and S1 will become s3.
TEST_F(TextChunkerTest, SampleSpanningMultipleCues) {
const int64_t kSegmentDuration = 8 * kTick;
const int64_t kSampleStart = kTick;
const int64_t kSampleDuration = 4 * kTick;
const int64_t kSampleEnd = kSampleStart + kSampleDuration;
const int64_t kCue0Time = 2 * kTick;
const double kCue0TimeInSeconds = kCue0Time / 1000.0;
const int64_t kCue1Time = 4 * kTick;
const double kCue1TimeInSeconds = kCue1Time / 1000.0;
const int64_t kSegment0Start = 0;
const int64_t kSegment0Duration = 2 * kTick;
const int64_t kSegment1Start = kSegment0Start + kSegment0Duration;
const int64_t kSegment1Duration = 2 * kTick;
const int64_t kSegment2Start = kSegment1Start + kSegment1Duration;
const int64_t kSegment2Duration = 8 * kTick;
Init(kSegmentDuration);
{
testing::InSequence s;
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
EXPECT_CALL(*Output(kOutput), OnProcess(IsStreamInfo(kStreamIndex)));
// Segment 0 and Cue 0
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSampleStart, kSampleEnd,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment0Start, kSegment0Duration,
!kSubSegment, !kEncrypted)));
EXPECT_CALL(*Output(kOutput),
OnProcess(IsCueEvent(kStreamIndex, kCue0TimeInSeconds)));
// Segment 1 and Cue 1
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSampleStart, kSampleEnd,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment1Start, kSegment1Duration,
!kSubSegment, !kEncrypted)));
EXPECT_CALL(*Output(kOutput),
OnProcess(IsCueEvent(kStreamIndex, kCue1TimeInSeconds)));
// Segment 2
EXPECT_CALL(*Output(kOutput),
OnProcess(IsTextSample(kNoId, kSampleStart, kSampleEnd,
kNoSettings, kNoPayload)));
EXPECT_CALL(
*Output(kOutput),
OnProcess(IsSegmentInfo(kStreamIndex, kSegment2Start, kSegment2Duration,
!kSubSegment, !kEncrypted)));
}
Make Test Util 'GetTextStreamInfo' require Time Scale Make the text stream info factory method in media_handler_test_base require the caller to specify the time scale. Issue: #399 Change-Id: Ibdfb183e0aa3f4ff50edf6b58c4e9b966006c6d2
2018-06-06 18:41:21 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromStreamInfo(
kStreamIndex, GetTextStreamInfo(kMsTimeScale))));
Handle CueEvent in TextChunker Updated TextChunker to handle incoming CueEvents. Connecting the text chunker with the cue alignment handler will happen in a later CL. Issue: #362 Change-Id: Ib1fa9f457cf4ec0ce413dadcfa7eed5895ecd628
2018-03-23 01:33:01 +00:00
ASSERT_OK(Input(kInput)->Dispatch(StreamData::FromTextSample(
kStreamIndex,
GetTextSample(kNoId, kSampleStart, kSampleEnd, kNoPayload))));
ASSERT_OK(Input(kInput)->Dispatch(
StreamData::FromCueEvent(kStreamIndex, GetCueEvent(kCue0TimeInSeconds))));
ASSERT_OK(Input(kInput)->Dispatch(
StreamData::FromCueEvent(kStreamIndex, GetCueEvent(kCue1TimeInSeconds))));
ASSERT_OK(Input(kInput)->FlushAllDownstreams());
Create Preserve Order Test Create WebVtt test that shows that the current implementation of the webvtt segmenter does not respect the input order of cues. Bug: 72867775 Change-Id: I811b3a93c10650e0cf9290c9c0c1680f562deb30
2018-02-02 22:28:10 +00:00
}
Created WebVtt Segmenter This change creates the webvtt segmenter which will be used for segmented text webvtt for HLS. It takes a stream of text samples and injects segment info messages based on the segment duration. It is possible for samples to extend between segments, if so the sample will appear twice (once in each segment). Change-Id: Iae0134ee61cf269948026086520b6d3f8ce3785b
2017-09-18 15:43:21 +00:00
} // namespace media
} // namespace shaka