Basic media tracks implementation for media stream parsers

media/formats/mpeg/mpeg_audio_stream_parser_base.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/mpeg/mpeg_audio_stream_parser_base.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.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/base/video_decoder_config.h"
 
 namespace media {
 
 static const uint32_t kICYStartCode = 0x49435920;  // 'ICY '
 
 // Arbitrary upper bound on the size of an IceCast header before it
@@ skipping 193 matching lines @@
                        base::TimeDelta(),
                        codec_delay_);
 
     base::TimeDelta base_timestamp;
     if (timestamp_helper_)
       base_timestamp = timestamp_helper_->GetTimestamp();
 
     timestamp_helper_.reset(new AudioTimestampHelper(sample_rate));
     timestamp_helper_->SetBaseTimestamp(base_timestamp);
 
-    VideoDecoderConfig video_config;
-    if (!config_cb_.Run(config_, video_config, TextTrackConfigMap()))
+    scoped_ptr<MediaTracks> media_tracks(new MediaTracks());
+    if (config_.IsValidConfig()) {

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

Hmm. Do we instead want to preserve the potential for invalid codec config to be
in |tracks| for use in determining in InitSegmentReceivedCB a particular error
path or error message?

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

I think it's better to just pass an empty MediaTracks collection to higher
levels, the MSE spec explicitly prescribes how to handle that (see step #2 in
https://w3c.github.io/media-source/#sourcebuffer-init-segment-received).

[wolenetz, 2016/02/26 19:29:27]

Ack. If we need more info on why a particular expected-to-be-valid codec config
wasn't present in a MediaTracks, we'd probably need to log this reason somewhere
in the parser, not at that higher level, so sgtm.

+      media_tracks->AddAudioTrack(config_, "audio", "", "", "");
+    }
+    if (!config_cb_.Run(std::move(media_tracks), TextTrackConfigMap()))
       return -1;
 
     if (!init_cb_.is_null()) {
       InitParameters params(kInfiniteDuration());
       params.auto_update_timestamp_offset = true;
       base::ResetAndReturn(&init_cb_).Run(params);
     }
   }
 
   if (metadata_frame)
@@ skipping 177 matching lines @@
   if (end_of_segment) {
     in_media_segment_ = false;
     end_of_segment_cb_.Run();
   }
 
   timestamp_helper_->SetBaseTimestamp(base::TimeDelta());
   return true;
 }
 
 }  // namespace media