MSE: Add StreamParser buffer remuxing utility and tests

media/formats/webm/webm_cluster_parser_unittest.cc

Index: media/formats/webm/webm_cluster_parser_unittest.cc
diff --git a/media/formats/webm/webm_cluster_parser_unittest.cc b/media/formats/webm/webm_cluster_parser_unittest.cc
index e14a3343e08536480c0d4adf5672dd634d527781..297d6998ed94fe836d1c6099e94604696183d1a6 100644
--- a/media/formats/webm/webm_cluster_parser_unittest.cc
+++ b/media/formats/webm/webm_cluster_parser_unittest.cc
@@ -96,6 +96,7 @@ static bool VerifyBuffers(const WebMClusterParser::BufferQueue& audio_buffers,
   for (int i = 0; i < block_count; i++) {
     const WebMClusterParser::BufferQueue* buffers = NULL;
     size_t* offset;
+    StreamParserBuffer::Type expected_type = StreamParserBuffer::kAudio;

[xhwang, 2014/01/29 08:04:50]

kAudio/UNKNOWN here, then set expected_type to kAudio after line 103?

[wolenetz, 2014/02/05 02:49:53]

Done.

 
     if (block_info[i].track_num == kAudioTrackNum) {
       buffers = &audio_buffers;
@@ -103,9 +104,11 @@ static bool VerifyBuffers(const WebMClusterParser::BufferQueue& audio_buffers,
     } else if (block_info[i].track_num == kVideoTrackNum) {
       buffers = &video_buffers;
       offset = &video_offset;
+      expected_type = StreamParserBuffer::kVideo;
     } else if (block_info[i].track_num == kTextTrackNum) {
       buffers = &text_buffers;
       offset = &text_offset;
+      expected_type = StreamParserBuffer::kText;
     } else {
       LOG(ERROR) << "Unexpected track number " << block_info[i].track_num;
       return false;
@@ -116,7 +119,6 @@ static bool VerifyBuffers(const WebMClusterParser::BufferQueue& audio_buffers,
 
     scoped_refptr<StreamParserBuffer> buffer = (*buffers)[(*offset)++];
 
-
     EXPECT_EQ(buffer->timestamp().InMilliseconds(), block_info[i].timestamp);
 
     if (!block_info[i].use_simple_block)
@@ -124,6 +126,10 @@ static bool VerifyBuffers(const WebMClusterParser::BufferQueue& audio_buffers,
 
     if (buffer->duration() != kNoTimestamp())
       EXPECT_EQ(buffer->duration().InMilliseconds(), block_info[i].duration);
+
+    EXPECT_EQ(buffer->type(), expected_type);
+    if (expected_type == StreamParserBuffer::kText)
+      EXPECT_EQ(buffer->text_track_number(), kTextTrackNum);
   }
 
   return true;
@@ -172,6 +178,8 @@ static bool VerifyTextBuffers(
     const scoped_refptr<StreamParserBuffer> buffer = *buffer_iter++;
     EXPECT_EQ(buffer->timestamp().InMilliseconds(), block_info.timestamp);
     EXPECT_EQ(buffer->duration().InMilliseconds(), block_info.duration);
+    EXPECT_EQ(buffer->type(), StreamParserBuffer::kText);
+    EXPECT_EQ(buffer->text_track_number(), text_track_num);

[xhwang, 2014/01/29 08:04:50]

FYI, we use EXPECT_EQ(expected, variable) style, not EXPECT_EQ(variable,
expected);

[wolenetz, 2014/02/05 02:49:53]

Done, also conformed a bunch of other places in this file to this.

   }
 
   EXPECT_TRUE(buffer_iter == buffer_end);