Basic media tracks implementation for media stream parsers

media/formats/mp2t/mp2t_stream_parser.cc

Index: media/formats/mp2t/mp2t_stream_parser.cc
diff --git a/media/formats/mp2t/mp2t_stream_parser.cc b/media/formats/mp2t/mp2t_stream_parser.cc
index 12c8a82d4b6230923934a508543f4ed04fe14ac3..40a10d5d367f3e291911ab3f44ae860510fa104c 100644
--- a/media/formats/mp2t/mp2t_stream_parser.cc
+++ b/media/formats/mp2t/mp2t_stream_parser.cc
@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/stl_util.h"
+#include "media/base/media_tracks.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/text_track_config.h"
 #include "media/base/timestamp_constants.h"
@@ -521,9 +522,16 @@ bool Mp2tStreamParser::FinishInitializationIfNeeded() {
     return true;
 
   // Pass the config before invoking the initialization callback.
-  RCHECK(config_cb_.Run(queue_with_config.audio_config,
-                        queue_with_config.video_config,
-                        TextTrackConfigMap()));
+  const AudioDecoderConfig& audio_config = queue_with_config.audio_config;
+  const VideoDecoderConfig& video_config = queue_with_config.video_config;
+  scoped_ptr<MediaTracks> media_tracks(new MediaTracks());
+  if (audio_config.IsValidConfig()) {
+    media_tracks->AddAudioTrack(audio_config, "audio", "", "", "");

[wolenetz, 2016/02/26 00:06:21]

Please add TODO and crbug for sourceing mp2ts inband track information correctly
here. See https://dev.w3.org/html5/html-sourcing-inband-tracks/#mpeg2ts

[servolk, 2016/02/26 01:56:32]

Done.

+  }
+  if (video_config.IsValidConfig()) {
+    media_tracks->AddVideoTrack(video_config, "video", "", "", "");

[wolenetz, 2016/02/26 00:06:21]

ditto (same TODO/crbug should cover this portion of this method..

[servolk, 2016/02/26 01:56:33]

Done.

+  }
+  RCHECK(config_cb_.Run(std::move(media_tracks), TextTrackConfigMap()));
   queue_with_config.is_config_sent = true;
 
   // For Mpeg2 TS, the duration is not known.
@@ -620,9 +628,16 @@ bool Mp2tStreamParser::EmitRemainingBuffers() {
     // Update the audio and video config if needed.
     BufferQueueWithConfig& queue_with_config = buffer_queue_chain_.front();
     if (!queue_with_config.is_config_sent) {
-      if (!config_cb_.Run(queue_with_config.audio_config,
-                          queue_with_config.video_config,
-                          TextTrackConfigMap()))
+      const AudioDecoderConfig& audio_config = queue_with_config.audio_config;

[wolenetz, 2016/02/26 00:06:21]

nit: lots of new code duplication: please add a helper that does all this.

[servolk, 2016/02/26 01:56:32]

Done.

+      const VideoDecoderConfig& video_config = queue_with_config.video_config;
+      scoped_ptr<MediaTracks> media_tracks(new MediaTracks());
+      if (audio_config.IsValidConfig()) {
+        media_tracks->AddAudioTrack(audio_config, "audio", "", "", "");
+      }
+      if (video_config.IsValidConfig()) {
+        media_tracks->AddVideoTrack(video_config, "video", "", "", "");
+      }
+      if (!config_cb_.Run(std::move(media_tracks), TextTrackConfigMap()))
         return false;
       queue_with_config.is_config_sent = true;
     }