Return buffers from StreamParsers in a single unified map

media/formats/webm/webm_cluster_parser.cc

 // Copyright 2014 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 "media/formats/webm/webm_cluster_parser.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 100 matching lines @@
     // call.
     parser_.Reset();
 
     last_block_timecode_ = -1;
     cluster_timecode_ = -1;
   }
 
   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())
     UpdateReadyBuffers();
 
   // Translate our |text_track_map_| into |text_buffers_map_|, inserting rows in
   // the output only for non-empty ready_buffer() queues in |text_track_map_|.
   text_buffers_map_.clear();
   for (TextTrackMap::const_iterator itr = text_track_map_.begin();
        itr != text_track_map_.end();
        ++itr) {
     const BufferQueue& text_buffers = itr->second.ready_buffers();
     if (!text_buffers.empty())
       text_buffers_map_.insert(std::make_pair(itr->first, text_buffers));
   }
 
   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) {
 
   // Duration is currently read assuming the *entire* stream is unencrypted.
   // The special "Signal Byte" prepended to Blocks in encrypted streams is
   // assumed to not be present.
   // TODO(chcunningham): Consider parsing "Signal Byte" for encrypted streams
   // to return duration for any unencrypted blocks.
 
@@ skipping 701 matching lines @@
 WebMClusterParser::FindTextTrack(int track_num) {
   const TextTrackMap::iterator it = text_track_map_.find(track_num);
 
   if (it == text_track_map_.end())
     return NULL;
 
   return &it->second;
 }
 
 }  // namespace media