MSE: Add StreamParser buffer remuxing utility and tests

media/base/stream_parser.h

 // 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.
 
 #ifndef MEDIA_BASE_STREAM_PARSER_H_
 #define MEDIA_BASE_STREAM_PARSER_H_
 
 #include <deque>
 #include <map>
 #include <string>
+#include <vector>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 
 namespace media {
 
@@ skipping 79 matching lines @@
   // Called when a seek occurs. This flushes the current parser state
   // and puts the parser in a state where it can receive data for the new seek
   // point.
   virtual void Flush() = 0;
 
   // Called when there is new data to parse.
   //
   // Returns true if the parse succeeds.
   virtual bool Parse(const uint8* buf, int size) = 0;
 
+  // Appends to |merged_buffers| the provided buffers in decode-timestamp order.
+  // Any previous contents of |merged_buffers| is assumed to have lower
+  // decode timestamps versus the provided buffers. All provided buffer queues
+  // are assumed to already be in decode-timestamp order.
+  // Returns false if any of the provided audio/video/text buffers are found
+  // to not be in decode timestamp order, or have a decode timestamp less than
+  // the last buffer, if any, in |merged_buffers|. Partial results may exist
+  // in |merged_buffers| in this case. Returns true on success.
+  // No validation of media type within the various buffer queues is done here.
+  // TODO(wolenetz/acolwell): Merge incrementally in parsers to eliminate
+  // subtle issues with tie-breaking. See http://crbug.com/338484.
+  static bool MergeBufferQueues(const BufferQueue& audio_buffers,
+                                const BufferQueue& video_buffers,
+                                const TextBufferQueueMap& text_buffers,
+                                BufferQueue* merged_buffers);

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

put static function before non-static functions.

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

Done (actually changed to non-member function per other comment).

+
  private:
+  // Helper that does the bulk of the overloaded method, above.
+  static bool MergeBufferQueues(std::vector<const BufferQueue*> buffer_queues,

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

pass the vector by const-ref?

We usually don't like function overload; rename to MergeBufferQueuesInternal?

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

Done and done. And made it a non-member .cc-scoped static function.

+                                BufferQueue* merged_buffers);
+
   DISALLOW_COPY_AND_ASSIGN(StreamParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_H_