diff options
Diffstat (limited to 'media/webm/webm_cluster_parser_unittest.cc')
| -rw-r--r-- | media/webm/webm_cluster_parser_unittest.cc | 93 |
1 files changed, 37 insertions, 56 deletions
diff --git a/media/webm/webm_cluster_parser_unittest.cc b/media/webm/webm_cluster_parser_unittest.cc index baa35f2..dc73329 100644 --- a/media/webm/webm_cluster_parser_unittest.cc +++ b/media/webm/webm_cluster_parser_unittest.cc @@ -203,14 +203,13 @@ static void AppendToEnd(const WebMClusterParser::BufferQueue& src, class WebMClusterParserTest : public testing::Test { public: WebMClusterParserTest() - : parser_(new WebMClusterParser(kTimecodeScale, - kAudioTrackNum, - kVideoTrackNum, - std::set<int>(), - std::set<int64>(), - std::string(), - std::string(), - LogCB())) {} + : parser_(new WebMClusterParser( + kTimecodeScale, kAudioTrackNum, kVideoTrackNum, + std::set<int>(), + std::set<int64>(), + "", "", + LogCB())) { + } protected: scoped_ptr<WebMClusterParser> parser_; @@ -335,14 +334,11 @@ TEST_F(WebMClusterParserTest, IgnoredTracks) { std::set<int64> ignored_tracks; ignored_tracks.insert(kTextTrackNum); - parser_.reset(new WebMClusterParser(kTimecodeScale, - kAudioTrackNum, - kVideoTrackNum, - std::set<int>(), - ignored_tracks, - std::string(), - std::string(), - LogCB())); + parser_.reset(new WebMClusterParser( + kTimecodeScale, kAudioTrackNum, kVideoTrackNum, + std::set<int>(), + ignored_tracks, "", "", + LogCB())); const BlockInfo kInputBlockInfo[] = { { kAudioTrackNum, 0, 23, true }, @@ -375,14 +371,11 @@ TEST_F(WebMClusterParserTest, ParseTextTracks) { std::set<int> text_tracks; text_tracks.insert(kTextTrackNum); - parser_.reset(new WebMClusterParser(kTimecodeScale, - kAudioTrackNum, - kVideoTrackNum, - text_tracks, - std::set<int64>(), - std::string(), - std::string(), - LogCB())); + parser_.reset(new WebMClusterParser( + kTimecodeScale, kAudioTrackNum, kVideoTrackNum, + text_tracks, + std::set<int64>(), "", "", + LogCB())); const BlockInfo kInputBlockInfo[] = { { kAudioTrackNum, 0, 23, true }, @@ -407,14 +400,11 @@ TEST_F(WebMClusterParserTest, TextTracksSimpleBlock) { std::set<int> text_tracks; text_tracks.insert(kTextTrackNum); - parser_.reset(new WebMClusterParser(kTimecodeScale, - kAudioTrackNum, - kVideoTrackNum, - text_tracks, - std::set<int64>(), - std::string(), - std::string(), - LogCB())); + parser_.reset(new WebMClusterParser( + kTimecodeScale, kAudioTrackNum, kVideoTrackNum, + text_tracks, + std::set<int64>(), "", "", + LogCB())); const BlockInfo kInputBlockInfo[] = { { kTextTrackNum, 33, 42, true }, @@ -438,14 +428,11 @@ TEST_F(WebMClusterParserTest, ParseMultipleTextTracks) { text_tracks.insert(kSubtitleTextTrackNum); text_tracks.insert(kCaptionTextTrackNum); - parser_.reset(new WebMClusterParser(kTimecodeScale, - kAudioTrackNum, - kVideoTrackNum, - text_tracks, - std::set<int64>(), - std::string(), - std::string(), - LogCB())); + parser_.reset(new WebMClusterParser( + kTimecodeScale, kAudioTrackNum, kVideoTrackNum, + text_tracks, + std::set<int64>(), "", "", + LogCB())); const BlockInfo kInputBlockInfo[] = { { kAudioTrackNum, 0, 23, true }, @@ -483,14 +470,11 @@ TEST_F(WebMClusterParserTest, ParseMultipleTextTracks) { TEST_F(WebMClusterParserTest, ParseEncryptedBlock) { scoped_ptr<Cluster> cluster(CreateEncryptedCluster(sizeof(kEncryptedFrame))); - parser_.reset(new WebMClusterParser(kTimecodeScale, - kAudioTrackNum, - kVideoTrackNum, - std::set<int>(), - std::set<int64>(), - std::string(), - "video_key_id", - LogCB())); + parser_.reset(new WebMClusterParser( + kTimecodeScale, kAudioTrackNum, kVideoTrackNum, + std::set<int>(), + std::set<int64>(), "", "video_key_id", + LogCB())); int result = parser_->Parse(cluster->data(), cluster->size()); EXPECT_EQ(cluster->size(), result); ASSERT_EQ(1UL, parser_->video_buffers().size()); @@ -502,14 +486,11 @@ TEST_F(WebMClusterParserTest, ParseBadEncryptedBlock) { scoped_ptr<Cluster> cluster( CreateEncryptedCluster(sizeof(kEncryptedFrame) - 1)); - parser_.reset(new WebMClusterParser(kTimecodeScale, - kAudioTrackNum, - kVideoTrackNum, - std::set<int>(), - std::set<int64>(), - std::string(), - "video_key_id", - LogCB())); + parser_.reset(new WebMClusterParser( + kTimecodeScale, kAudioTrackNum, kVideoTrackNum, + std::set<int>(), + std::set<int64>(), "", "video_key_id", + LogCB())); int result = parser_->Parse(cluster->data(), cluster->size()); EXPECT_EQ(-1, result); } |