Return buffers from StreamParsers in a single unified map

media/formats/webm/webm_cluster_parser.cc

Index: media/formats/webm/webm_cluster_parser.cc
diff --git a/media/formats/webm/webm_cluster_parser.cc b/media/formats/webm/webm_cluster_parser.cc
index c9b85b242415566ccfc0ed68356be39f195b0b4e..89fe70ecc045424b09e7eef99e1f5f6ae9b4e967 100644
--- a/media/formats/webm/webm_cluster_parser.cc
+++ b/media/formats/webm/webm_cluster_parser.cc
@@ -118,20 +118,6 @@ int WebMClusterParser::Parse(const uint8_t* buf, int size) {
   return result;
 }
 
-const WebMClusterParser::BufferQueue& WebMClusterParser::GetAudioBuffers() {
-  if (ready_buffer_upper_bound_ == kNoDecodeTimestamp())
-    UpdateReadyBuffers();
-
-  return audio_.ready_buffers();
-}
-
-const WebMClusterParser::BufferQueue& WebMClusterParser::GetVideoBuffers() {
-  if (ready_buffer_upper_bound_ == kNoDecodeTimestamp())
-    UpdateReadyBuffers();
-
-  return video_.ready_buffers();
-}
-
 const WebMClusterParser::TextBufferQueueMap&
 WebMClusterParser::GetTextBuffers() {
   if (ready_buffer_upper_bound_ == kNoDecodeTimestamp())
@@ -151,6 +137,26 @@ WebMClusterParser::GetTextBuffers() {
   return text_buffers_map_;
 }
 
+void WebMClusterParser::GetBuffers(StreamParser::BufferQueueMap* buffers) {
+  DCHECK(buffers->empty());
+  if (ready_buffer_upper_bound_ == kNoDecodeTimestamp())
+    UpdateReadyBuffers();
+  const BufferQueue& audio_buffers = audio_.ready_buffers();
+  if (!audio_buffers.empty()) {
+    buffers->insert(std::make_pair(audio_.track_num(), audio_buffers));
+  }
+  const BufferQueue& video_buffers = video_.ready_buffers();
+  if (!video_buffers.empty()) {
+    buffers->insert(std::make_pair(video_.track_num(), video_buffers));
+  }
+  const WebMClusterParser::TextBufferQueueMap& text_buffers = GetTextBuffers();
+  for (const auto& it : text_buffers) {
+    if (!it.second.empty()) {

[wolenetz, 2016/08/23 21:31:21]

per ::GetTextBuffers(), it.second is guaranteed to be !empty(). change to DCHECK
and unconditionally do the assertion here.

[servolk, 2016/08/23 23:56:32]

Done.

+      buffers->insert(it);
+    }
+  }
+}
+
 base::TimeDelta WebMClusterParser::TryGetEncodedAudioDuration(
     const uint8_t* data,
     int size) {