Basic media tracks implementation for media stream parsers

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 <utility>
 
 #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"
 #include "media/formats/mp2t/es_parser.h"
 #include "media/formats/mp2t/es_parser_adts.h"
 #include "media/formats/mp2t/es_parser_h264.h"
 #include "media/formats/mp2t/es_parser_mpeg1audio.h"
 #include "media/formats/mp2t/mp2t_common.h"
 #include "media/formats/mp2t/ts_packet.h"
 #include "media/formats/mp2t/ts_section.h"
@@ skipping 492 matching lines @@
   // Wait for more data to come if one of the config is not available.
   BufferQueueWithConfig& queue_with_config = buffer_queue_chain_.front();
   if (selected_audio_pid_ > 0 &&
       !queue_with_config.audio_config.IsValidConfig())
     return true;
   if (selected_video_pid_ > 0 &&
       !queue_with_config.video_config.IsValidConfig())
     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.
   DVLOG(1) << "Mpeg2TS stream parser initialization done";
   base::ResetAndReturn(&init_cb_).Run(InitParameters(kInfiniteDuration()));
   is_initialized_ = true;
 
   return true;
 }
 
@@ skipping 76 matching lines @@
     // Start a segment if needed.
     if (!segment_started_) {
       DVLOG(1) << "Starting a new segment";
       segment_started_ = true;
       new_segment_cb_.Run();
     }
 
     // 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;
     }
 
     // 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;
       }
     }
 
     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