Return buffers from StreamParsers in a single unified map

media/formats/webm/webm_stream_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_stream_parser.h"
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 246 matching lines @@
 }
 
 int WebMStreamParser::ParseCluster(const uint8_t* data, int size) {
   if (!cluster_parser_)
     return -1;
 
   int bytes_parsed = cluster_parser_->Parse(data, size);
   if (bytes_parsed < 0)
     return bytes_parsed;
 
-  const BufferQueue& audio_buffers = cluster_parser_->GetAudioBuffers();
-  const BufferQueue& video_buffers = cluster_parser_->GetVideoBuffers();
-  const TextBufferQueueMap& text_map = cluster_parser_->GetTextBuffers();
+  BufferQueueMap buffer_queue_map;
+  cluster_parser_->GetBuffers(&buffer_queue_map);
 
   bool cluster_ended = cluster_parser_->cluster_ended();
 
-  if ((!audio_buffers.empty() || !video_buffers.empty() ||
-       !text_map.empty()) &&
-      !new_buffers_cb_.Run(audio_buffers, video_buffers, text_map)) {
+  if (!buffer_queue_map.empty() && !new_buffers_cb_.Run(buffer_queue_map)) {
     return -1;
   }
 
   if (cluster_ended) {
     ChangeState(kParsingHeaders);
     end_of_segment_cb_.Run();
   }
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) {
   std::vector<uint8_t> key_id_vector(key_id.begin(), key_id.end());
   encrypted_media_init_data_cb_.Run(EmeInitDataType::WEBM, key_id_vector);
 }
 
 }  // namespace media