Render inband text tracks in the media pipeline

media/mp2t/mp2t_stream_parser_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/test_data_util.h"
+#include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/mp2t/mp2t_stream_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace mp2t {
 
 class Mp2tStreamParserTest : public testing::Test {
  public:
   Mp2tStreamParserTest()
@@ skipping 26 matching lines @@
       start += append_size;
     }
     return true;
   }
 
   void OnInit(bool init_ok, base::TimeDelta duration) {
     DVLOG(1) << "OnInit: ok=" << init_ok
              << ", dur=" << duration.InMilliseconds();
   }
 
-  bool OnNewConfig(const AudioDecoderConfig& ac, const VideoDecoderConfig& vc) {
+  bool OnNewConfig(const AudioDecoderConfig& ac,
+                   const VideoDecoderConfig& vc,
+                   const TextTrackConfigMap& tc) {
     DVLOG(1) << "OnNewConfig: audio=" << ac.IsValidConfig()
              << ", video=" << vc.IsValidConfig();
     return true;
   }
 
 
   void DumpBuffers(const std::string& label,
                    const StreamParser::BufferQueue& buffers) {
     DVLOG(2) << "DumpBuffers: " << label << " size " << buffers.size();
     for (StreamParser::BufferQueue::const_iterator buf = buffers.begin();
@@ skipping 20 matching lines @@
       StreamParser::BufferQueue::const_iterator it2 = ++it1;
       for ( ; it2 != video_buffers.end(); ++it1, ++it2) {
         if ((*it2)->GetDecodeTimestamp() < (*it1)->GetDecodeTimestamp())
           return false;
       }
     }
 
     return true;
   }
 
-  bool OnNewTextBuffers(TextTrack* text_track,
+  bool OnNewTextBuffers(int text_track,

[acolwell GONE FROM CHROMIUM, 2013/10/29 21:14:19]

nit: Remove this since you are removing the reference below.

[Matthew Heaney (Chromium), 2013/11/05 04:52:40]

Done.

                         const StreamParser::BufferQueue& buffers) {
     return true;
   }
 
   void OnKeyNeeded(const std::string& type,
                    const std::vector<uint8>& init_data) {
     DVLOG(1) << "OnKeyNeeded: " << init_data.size();
   }
 
-  scoped_ptr<TextTrack> OnAddTextTrack(
-      TextKind kind,
-      const std::string& label,
-      const std::string& language) {
-    return scoped_ptr<TextTrack>();
-  }
-
   void OnNewSegment() {
     DVLOG(1) << "OnNewSegment";
   }
 
   void OnEndOfSegment() {
     DVLOG(1) << "OnEndOfSegment()";
   }
 
   void InitializeParser() {
     parser_->Init(
         base::Bind(&Mp2tStreamParserTest::OnInit,
                    base::Unretained(this)),
         base::Bind(&Mp2tStreamParserTest::OnNewConfig,
                    base::Unretained(this)),
         base::Bind(&Mp2tStreamParserTest::OnNewBuffers,
                    base::Unretained(this)),
-        base::Bind(&Mp2tStreamParserTest::OnNewTextBuffers,
-                   base::Unretained(this)),
+        StreamParser::NewTextBuffersCB(),
         base::Bind(&Mp2tStreamParserTest::OnKeyNeeded,
                    base::Unretained(this)),
-        base::Bind(&Mp2tStreamParserTest::OnAddTextTrack,
-                   base::Unretained(this)),
         base::Bind(&Mp2tStreamParserTest::OnNewSegment,
                    base::Unretained(this)),
         base::Bind(&Mp2tStreamParserTest::OnEndOfSegment,
                    base::Unretained(this)),
         LogCB());
   }
 
   bool ParseMpeg2TsFile(const std::string& filename, int append_bytes) {
     InitializeParser();
 
@@ skipping 27 matching lines @@
   // (close to 2^33 / 90000) which results in timestamps wrap around
   // in the Mpeg2 TS stream.
   ParseMpeg2TsFile("bear-1280x720_ptswraparound.ts", 512);
   EXPECT_EQ(video_frame_count_, 81);
   EXPECT_GE(video_min_dts_, base::TimeDelta::FromSeconds(95443 - 10));
   EXPECT_LE(video_max_dts_, base::TimeDelta::FromSeconds(95443 + 10));
 }
 
 }  // namespace mp2t
 }  // namespace media