Render inband text tracks in the media pipeline

media/webm/webm_cluster_parser_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/decrypt_config.h"
 #include "media/webm/cluster_builder.h"
@@ skipping 356 matching lines @@
       CreateCluster(0, kInputBlockInfo, input_block_count));
 
   int result = parser_->Parse(cluster->data(), cluster->size());
   EXPECT_EQ(cluster->size(), result);
   ASSERT_TRUE(VerifyBuffers(parser_, kOutputBlockInfo, output_block_count));
 }
 
 TEST_F(WebMClusterParserTest, ParseTextTracks) {
   typedef WebMTracksParser::TextTracks TextTracks;
   TextTracks text_tracks;
-  WebMTracksParser::TextTrackInfo text_track_info;
 
-  text_track_info.kind = kTextSubtitles;
   text_tracks.insert(std::make_pair(TextTracks::key_type(kTextTrackNum),
-                                    text_track_info));
+                                    TextTrackConfig(kTextSubtitles, "", "")));
 
   parser_.reset(new WebMClusterParser(kTimecodeScale,
                                       kAudioTrackNum,
                                       kVideoTrackNum,
                                       text_tracks,
                                       std::set<int64>(),
                                       std::string(),
                                       std::string(),
                                       LogCB()));
 
@@ skipping 11 matching lines @@
   scoped_ptr<Cluster> cluster(
       CreateCluster(0, kInputBlockInfo, input_block_count));
 
   int result = parser_->Parse(cluster->data(), cluster->size());
   EXPECT_EQ(cluster->size(), result);
   ASSERT_TRUE(VerifyBuffers(parser_, kInputBlockInfo, input_block_count));
 }
 
 TEST_F(WebMClusterParserTest, TextTracksSimpleBlock) {
   typedef WebMTracksParser::TextTracks TextTracks;
-  TextTracks text_tracks;
-  WebMTracksParser::TextTrackInfo text_track_info;
+  WebMTracksParser::TextTracks text_tracks;
 
-  text_track_info.kind = kTextSubtitles;
   text_tracks.insert(std::make_pair(TextTracks::key_type(kTextTrackNum),
-                                    text_track_info));
+                                    TextTrackConfig(kTextSubtitles, "", "")));
 
   parser_.reset(new WebMClusterParser(kTimecodeScale,
                                       kAudioTrackNum,
                                       kVideoTrackNum,
                                       text_tracks,
                                       std::set<int64>(),
                                       std::string(),
                                       std::string(),
                                       LogCB()));
 
   const BlockInfo kInputBlockInfo[] = {
     { kTextTrackNum,  33, 42, true },
   };
   int input_block_count = arraysize(kInputBlockInfo);
 
   scoped_ptr<Cluster> cluster(
       CreateCluster(0, kInputBlockInfo, input_block_count));
 
   int result = parser_->Parse(cluster->data(), cluster->size());
   EXPECT_LT(result, 0);
 }
 
 TEST_F(WebMClusterParserTest, ParseMultipleTextTracks) {
   typedef WebMTracksParser::TextTracks TextTracks;
   TextTracks text_tracks;
-  WebMTracksParser::TextTrackInfo text_track_info;
 
   const int kSubtitleTextTrackNum = kTextTrackNum;
   const int kCaptionTextTrackNum = kTextTrackNum + 1;
 
-  text_track_info.kind = kTextSubtitles;
   text_tracks.insert(std::make_pair(TextTracks::key_type(kSubtitleTextTrackNum),
-                                    text_track_info));
+                                    TextTrackConfig(kTextSubtitles, "", "")));
 
-  text_track_info.kind = kTextCaptions;
   text_tracks.insert(std::make_pair(TextTracks::key_type(kCaptionTextTrackNum),
-                                    text_track_info));
+                                    TextTrackConfig(kTextCaptions, "", "")));
 
   parser_.reset(new WebMClusterParser(kTimecodeScale,
                                       kAudioTrackNum,
                                       kVideoTrackNum,
                                       text_tracks,
                                       std::set<int64>(),
                                       std::string(),
                                       std::string(),
                                       LogCB()));
 
@@ skipping 58 matching lines @@
                                       WebMTracksParser::TextTracks(),
                                       std::set<int64>(),
                                       std::string(),
                                       "video_key_id",
                                       LogCB()));
   int result = parser_->Parse(cluster->data(), cluster->size());
   EXPECT_EQ(-1, result);
 }
 
 }  // namespace media