Return buffers from StreamParsers in a single unified map

media/formats/mp4/mp4_stream_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_MP4_MP4_STREAM_PARSER_H_
 #define MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 55 matching lines @@
   // this offset is no longer needed by the parser.
   // Returns 'true' on success, 'false' if there was an error.
   bool ReadAndDiscardMDATsUntil(int64_t max_clear_offset);
 
   void ChangeState(State new_state);
 
   bool EmitConfigs();
   bool PrepareAACBuffer(const AAC& aac_config,
                         std::vector<uint8_t>* frame_buf,
                         std::vector<SubsampleEntry>* subsamples) const;
-  bool EnqueueSample(BufferQueue* audio_buffers,
-                     BufferQueue* video_buffers,
-                     bool* err);
-  bool SendAndFlushSamples(BufferQueue* audio_buffers,
-                           BufferQueue* video_buffers);
+  bool EnqueueSample(BufferQueueMap* buffers, bool* err);
+  bool SendAndFlushSamples(BufferQueueMap* buffers);
 
   void Reset();
 
   // Checks to see if we have enough data in |queue_| to transition to
   // kEmittingSamples and start enqueuing samples.
   bool HaveEnoughDataToEnqueueSamples();
 
   // Sets |highest_end_offset_| based on the data in |moov_|
   // and |moof|. Returns true if |highest_end_offset_| was successfully
   // computed.
@@ skipping 42 matching lines @@
   // prevent log spam.
   int num_top_level_box_skipped_;
 
   DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_