Return buffers from StreamParsers in a single unified map

media/formats/webm/webm_cluster_parser.h

 // 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.
 
 #ifndef MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 166 matching lines @@
   // due to missing duration, the buffer is given an estimated duration and
   // included in the result.
   // Otherwise, if there are is a buffer held aside due to missing duration for
   // any of the tracks, no buffers with same or greater (decode) timestamp will
   // be included in the buffers.
   // The returned deques are cleared by Parse() or Reset() and updated by the
   // next calls to Get{Audio,Video}Buffers().
   // If no Parse() or Reset() has occurred since the last call to Get{Audio,
   // Video,Text}Buffers(), then the previous BufferQueue& is returned again
   // without any recalculation.
-  const BufferQueue& GetAudioBuffers();
-  const BufferQueue& GetVideoBuffers();
+  void GetBuffers(StreamParser::BufferQueueMap* buffers);
 
   // Constructs and returns a subset of |text_track_map_| containing only
   // tracks with non-empty buffer queues produced by the last Parse() and
   // filtered to exclude any buffers that have (decode) timestamp same or
   // greater than the lowest (decode) timestamp across all tracks of any buffer
   // held aside due to missing duration (unless the end of cluster has been
   // reached).
   // The returned map is cleared by Parse() or Reset() and updated by the next
   // call to GetTextBuffers().
   // If no Parse() or Reset() has occurred since the last call to
@@ skipping 118 matching lines @@
   DecodeTimestamp ready_buffer_upper_bound_;
 
   scoped_refptr<MediaLog> media_log_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_