Return buffers from StreamParsers in a single unified map

media/formats/mp2t/mp2t_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/mp2t/mp2t_stream_parser.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 494 matching lines @@
   }
 }
 
 std::unique_ptr<MediaTracks> GenerateMediaTrackInfo(
     const AudioDecoderConfig& audio_config,
     const VideoDecoderConfig& video_config) {
   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
   // TODO(servolk): Implement proper sourcing of media track info as described
   // in crbug.com/590085
   if (audio_config.IsValidConfig()) {
-    media_tracks->AddAudioTrack(audio_config, 1, "main", "", "");
+    media_tracks->AddAudioTrack(audio_config, kMp2tAudioTrackId, "main", "",
+                                "");
   }
   if (video_config.IsValidConfig()) {
-    media_tracks->AddVideoTrack(video_config, 2, "main", "", "");
+    media_tracks->AddVideoTrack(video_config, kMp2tVideoTrackId, "main", "",
+                                "");
   }
   return media_tracks;
 }
 
 bool Mp2tStreamParser::FinishInitializationIfNeeded() {
   // Nothing to be done if already initialized.
   if (is_initialized_)
     return true;
 
   // Wait for more data to come to finish initialization.
@@ skipping 119 matching lines @@
     BufferQueueWithConfig& queue_with_config = buffer_queue_chain_.front();
     if (!queue_with_config.is_config_sent) {
       std::unique_ptr<MediaTracks> media_tracks = GenerateMediaTrackInfo(
           queue_with_config.audio_config, queue_with_config.video_config);
       if (!config_cb_.Run(std::move(media_tracks), TextTrackConfigMap()))
         return false;
       queue_with_config.is_config_sent = true;
     }
 
     // Add buffers.
-    TextBufferQueueMap empty_text_map;
-    if (!queue_with_config.audio_queue.empty() ||
-        !queue_with_config.video_queue.empty()) {
-      if (!new_buffers_cb_.Run(queue_with_config.audio_queue,
-                               queue_with_config.video_queue,
-                               empty_text_map)) {
-        return false;
-      }
-    }
+    BufferQueueMap buffer_queue_map;
+    if (!queue_with_config.audio_queue.empty())
+      buffer_queue_map.insert(
+          std::make_pair(kMp2tAudioTrackId, queue_with_config.audio_queue));
+    if (!queue_with_config.video_queue.empty())
+      buffer_queue_map.insert(
+          std::make_pair(kMp2tVideoTrackId, queue_with_config.video_queue));
+
+    if (!buffer_queue_map.empty() && !new_buffers_cb_.Run(buffer_queue_map))
+      return false;
 
     buffer_queue_chain_.pop_front();
   }
 
   // Push an empty queue with the last audio/video config
   // so that buffers with the same config can be added later on.
   BufferQueueWithConfig queue_with_config(
       true, last_audio_config, last_video_config);
   buffer_queue_chain_.push_back(queue_with_config);
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media