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/formats/webvtt/webvtt_parser_unittest.cc

390 lines
10 KiB
C++
Raw Normal View History

WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +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>
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
#include "packager/file/file.h"
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
#include "packager/media/base/media_handler_test_base.h"
#include "packager/media/formats/webvtt/text_readers.h"
#include "packager/media/formats/webvtt/webvtt_parser.h"
#include "packager/status_test_util.h"
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
using ::testing::_;
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
using ::testing::SaveArgPointee;
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
namespace shaka {
namespace media {
namespace {
Fix language option not honored on text streams Change-Id: I9034b779e9b193c39201a5f2d142ec390927e5f7
2018-02-08 02:28:51 +00:00
const char kLanguage[] = "en";
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
const size_t kInputCount = 0;
const size_t kOutputCount = 1;
const size_t kOutputIndex = 0;
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
const uint32_t kTimeScale = 1000;
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
const bool kEncrypted = true;
const char* kNoId = "";
const char* kNoSettings = "";
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
std::string ToString(const std::vector<uint8_t>& v) {
return std::string(v.begin(), v.end());
}
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
} // namespace
class WebVttParserTest : public MediaHandlerTestBase {
protected:
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
void SetUpAndInitializeGraph(const char* text) {
const char* kFilename = "memory://test-file";
// Create the input file from the text passed to the test.
ASSERT_TRUE(File::WriteStringToFile(kFilename, text));
// Read from the file we just wrote.
Fix reading WebVTT from a pipe Opening a named pipe can block until both ends are open, and we cannot control when the other end will be open. Ideally, we would always open files in a thread so that Packager can be used with piped inputs from naive applications without a potential deadlock. This change will defer opening WebVTT files until the parser Run() method is called from a thread. This way, WebVTT files being sent in from a pipe will never be able to block the main thread. Previously, files were opened on the main thread before calling the parser constructor, passing the open file to the constructor as an argument. I also tried doing it in the parser's InitializeInternal() method, but that is also called from the main thread. Change-Id: I54cc68ed9d48a8dc697829119be84d4065b1ae1c
2020-03-19 20:54:55 +00:00
parser_ = std::make_shared<WebVttParser>(kFilename, kLanguage);
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
ASSERT_OK(MediaHandlerTestBase::SetUpAndInitializeGraph(
parser_, kInputCount, kOutputCount));
}
std::shared_ptr<OriginHandler> parser_;
};
TEST_F(WebVttParserTest, FailToParseEmptyFile) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text = "";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnProcess(testing::_)).Times(0);
EXPECT_CALL(*Output(kOutputIndex), OnFlush(testing::_)).Times(0);
ASSERT_NE(Status::OK, parser_->Run());
}
TEST_F(WebVttParserTest, ParseOnlyHeader) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
{
testing::InSequence s;
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnProcess(_)).Times(0);
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
ASSERT_OK(parser_->Run());
}
TEST_F(WebVttParserTest, ParseHeaderWithBOM) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
Fixed Incorrect BOM used in WEBVTT Header When originally implementing the webvtt parser, there was a misunderstanding in what the BOM was suppose to be (https://en.wikipedia.org/wiki/Byte_order_mark). This corrects the misunderstanding. Close #397 Change-Id: I250d392db228e5e9b86684614b57adc5d8a4e5fe
2018-05-16 23:17:45 +00:00
"\xEF\xBB\xBFWEBVTT\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
{
testing::InSequence s;
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnProcess(_)).Times(0);
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
ASSERT_OK(parser_->Run());
}
TEST_F(WebVttParserTest, FailToParseHeaderWrongWord) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"NOT WEBVTT\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnProcess(testing::_)).Times(0);
EXPECT_CALL(*Output(kOutputIndex), OnFlush(testing::_)).Times(0);
ASSERT_NE(Status::OK, parser_->Run());
}
TEST_F(WebVttParserTest, FailToParseHeaderNotOneLine) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
"WEBVTT\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnProcess(testing::_)).Times(0);
EXPECT_CALL(*Output(kOutputIndex), OnFlush(testing::_)).Times(0);
ASSERT_NE(Status::OK, parser_->Run());
}
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
TEST_F(WebVttParserTest, IgnoresZeroDurationCues) {
Skip Style and Region Blocks To ensure that we can parse content with style and region blocks, this change updates the parser to skip those blocks so that we can still parse the cues from a file. Full style and region support will be added later this year. Issue #380 Change-Id: I11b8fd862a108c27a5c67b15d4703532b44a1214
2018-04-24 17:42:10 +00:00
const char* text =
"WEBVTT\n"
"\n"
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
"00:01:00.000 --> 00:01:00.000\n"
"This subtitle would never show\n";
Skip Style and Region Blocks To ensure that we can parse content with style and region blocks, this change updates the parser to skip those blocks so that we can still parse the cues from a file. Full style and region support will be added later this year. Issue #380 Change-Id: I11b8fd862a108c27a5c67b15d4703532b44a1214
2018-04-24 17:42:10 +00:00
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)));
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
Skip Style and Region Blocks To ensure that we can parse content with style and region blocks, this change updates the parser to skip those blocks so that we can still parse the cues from a file. Full style and region support will be added later this year. Issue #380 Change-Id: I11b8fd862a108c27a5c67b15d4703532b44a1214
2018-04-24 17:42:10 +00:00
}
ASSERT_OK(parser_->Run());
}
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
TEST_F(WebVttParserTest, ParseOneCue) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
"\n"
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
"00:01:00.000 --> 01:00:00.000\n"
"subtitle\n";
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
{
testing::InSequence s;
WebVtt Ignore Zero Duration Cues We have an assert that ensures that the end time is greater than the start time for any cue. However we never checked that cues had a non-zero duration when parsing them. We will throw away cues with a duration of zero (and print a warning message) as they are not spec compliant. Closes: #335 Change-Id: I404e8f3a5a8d43eff75a2554db3e38e8d340f421
2018-03-01 21:46:08 +00:00
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex),
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
OnProcess(IsTextSample(_, kNoId, 60000u, 3600000u, kNoSettings,
"subtitle")));
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
ASSERT_OK(parser_->Run());
}
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
TEST_F(WebVttParserTest, ParseOneCueWithStyleAndRegion) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
"\n"
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
"STYLE\n"
"::cue { color:lime }\n"
"\n"
"REGION\n"
"id:scroll\n"
"scrol:up\n"
"\n"
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"00:01:00.000 --> 01:00:00.000\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"subtitle\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
StreamData stream_data;
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutputIndex),
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)))
.WillOnce(SaveArgPointee<0>(&stream_data));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, kNoId, 60000u, 3600000u, kNoSettings,
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle")));
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
ASSERT_OK(parser_->Run());
Support STYLE and REGION in WebVTT Note that STYLE and REGION are not supported in mp4 container due to spec limitation as 14496-30:2014 does not specify a way to signal styles/regions inside mp4. Closes #344. Change-Id: I05c14df916f7b2c7ca4364ee9407e0eda4dc7a3f
2018-08-17 20:27:59 +00:00
EXPECT_EQ(ToString(stream_data.stream_info->codec_config()),
"STYLE\n"
"::cue { color:lime }\n"
"\n"
"REGION\n"
"id:scroll\n"
"scrol:up");
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
[WebVTT] support cues without payload WebVTT cues without payload may not carry meaningful information, but it is allowed by WebVTT specification [1]. It could also be useful sometimes, e.g. to signal the time progression in live case. Fixes #433. [1] https://www.w3.org/TR/webvtt1/#types-of-webvtt-cue-payload Change-Id: I9e31f4a3789cbdafb7667b64f4019834190ecfc0
2018-07-16 23:39:41 +00:00
TEST_F(WebVttParserTest, ParseOneEmptyCue) {
const char* text =
"WEBVTT\n"
"\n"
"00:01:00.000 --> 01:00:00.000\n"
"\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutputIndex),
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)));
EXPECT_CALL(
*Output(kOutputIndex),
OnProcess(IsTextSample(_, kNoId, 60000u, 3600000u, kNoSettings, "")));
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
}
ASSERT_OK(parser_->Run());
}
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
TEST_F(WebVttParserTest, FailToParseCueWithArrowInId) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
"\n"
"-->\n"
"00:01:00.000 --> 01:00:00.000\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"subtitle\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
ASSERT_NE(Status::OK, parser_->Run());
}
TEST_F(WebVttParserTest, ParseOneCueWithId) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
"\n"
"id\n"
"00:01:00.000 --> 01:00:00.000\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"subtitle\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, "id", 60000u, 3600000u, kNoSettings,
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle")));
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
ASSERT_OK(parser_->Run());
}
[WebVTT] support cues without payload WebVTT cues without payload may not carry meaningful information, but it is allowed by WebVTT specification [1]. It could also be useful sometimes, e.g. to signal the time progression in live case. Fixes #433. [1] https://www.w3.org/TR/webvtt1/#types-of-webvtt-cue-payload Change-Id: I9e31f4a3789cbdafb7667b64f4019834190ecfc0
2018-07-16 23:39:41 +00:00
TEST_F(WebVttParserTest, ParseOneEmptyCueWithId) {
const char* text =
"WEBVTT\n"
"\n"
"id\n"
"00:01:00.000 --> 01:00:00.000\n"
"\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutputIndex),
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)));
EXPECT_CALL(
*Output(kOutputIndex),
OnProcess(IsTextSample(_, "id", 60000u, 3600000u, kNoSettings, "")));
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
}
ASSERT_OK(parser_->Run());
}
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
TEST_F(WebVttParserTest, ParseOneCueWithSettings) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
"\n"
"00:01:00.000 --> 01:00:00.000 size:50%\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"subtitle\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, kNoId, 60000u, 3600000u, "size:50%",
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle")));
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
ASSERT_OK(parser_->Run());
}
// Verify that a typical case with mulitple cues work.
TEST_F(WebVttParserTest, ParseMultipleCues) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
"\n"
"00:00:01.000 --> 00:00:05.200\n"
"subtitle A\n"
"\n"
"00:00:02.321 --> 00:00:07.000\n"
"subtitle B\n"
"\n"
"00:00:05.800 --> 00:00:08.000\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"subtitle C\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, kNoId, 1000u, 5200u, kNoSettings,
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle A")));
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, kNoId, 2321u, 7000u, kNoSettings,
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle B")));
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, kNoId, 5800u, 8000u, kNoSettings,
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle C")));
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
ASSERT_OK(parser_->Run());
}
// Verify that a typical case with mulitple cues work even when comments are
// present.
TEST_F(WebVttParserTest, ParseWithComments) {
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
const char* text =
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"WEBVTT\n"
"\n"
"NOTE This is a one line comment\n"
"\n"
"00:00:01.000 --> 00:00:05.200\n"
"subtitle A\n"
"\n"
"NOTE\n"
"This is a multi-line comment\n"
"\n"
"00:00:02.321 --> 00:00:07.000\n"
"subtitle B\n"
"\n"
"NOTE This is a single line comment that\n"
"spans two lines\n"
"\n"
"NOTE\tThis is a comment that using a tab\n"
"\n"
"00:00:05.800 --> 00:00:08.000\n"
Change CharReader to FileReader Instead of having multiple char readers, one for strings and one for files, just have one for files and use memory files when testing. Change-Id: Id1a2230046ba540ddf69ca10edb3edc74d2419b6
2018-01-03 00:35:38 +00:00
"subtitle C\n";
ASSERT_NO_FATAL_FAILURE(SetUpAndInitializeGraph(text));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
{
testing::InSequence s;
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsStreamInfo(_, kTimeScale, !kEncrypted, _)));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, kNoId, 1000u, 5200u, kNoSettings,
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle A")));
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, kNoId, 2321u, 7000u, kNoSettings,
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle B")));
EXPECT_CALL(*Output(kOutputIndex),
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
OnProcess(IsTextSample(_, kNoId, 5800u, 8000u, kNoSettings,
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
"subtitle C")));
Updated StreamData Matchers to Use Matchers Updated all the stream data matcher we use in our unit tests to allow us to use matchers in them. We are now able to use "_" to ignore specific parameters. With this we were able to replace the different version of matchers for each stream data type with a single instance for each type. Includes updates to printing strings to the listener. Strings now go through a "pretty" function to help make it easier to read them in the output. Change-Id: I146351b54fccd63ab9ec936877e6c6b30f9aa9fc
2018-05-25 17:41:02 +00:00
EXPECT_CALL(*Output(kOutputIndex), OnFlush(_));
WebVTT Parser Took the WebVTT Media Parser and created the WebVTT Parser that will take in a file and output a stream of cues that will later be passed to another Media Handler that takes in cues and chunks them. Bug: 36138902 Change-Id: Ic77813fe19678e85d500269e69f46917510ab7ec
2017-09-14 16:15:24 +00:00
}
ASSERT_OK(parser_->Run());
}
} // namespace media
} // namespace shaka