Unify media track info reporting on a demuxer level

media/blink/websourcebuffer_impl.cc

 // Copyright 2013 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/blink/websourcebuffer_impl.h"
 
 #include <stdint.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 28 matching lines @@
       time * base::Time::kMicrosecondsPerSecond);
 }
 
 WebSourceBufferImpl::WebSourceBufferImpl(
     const std::string& id, ChunkDemuxer* demuxer)
     : id_(id),
       demuxer_(demuxer),
       client_(NULL),
       append_window_end_(kInfiniteDuration()) {
   DCHECK(demuxer_);
+  demuxer_->SetTracksWatcher(

[wolenetz, 2016/03/05 01:47:43]

This seems like a method that could be elevated to demuxer.h and therefore be in
common across ffmpegdemuxer and chunkdemuxer.
wdyt?

+      id, base::Bind(&WebSourceBufferImpl::InitSegmentReceived,
+                     base::Unretained(this)));
 }
 
 WebSourceBufferImpl::~WebSourceBufferImpl() {
   DCHECK(!demuxer_) << "Object destroyed w/o removedFromMediaSource() call";
   DCHECK(!client_);
 }
 
 void WebSourceBufferImpl::setClient(blink::WebSourceBufferClient* client) {
   DCHECK(client);
   DCHECK(!client_);
@@ skipping 33 matching lines @@
       id_,
       base::TimeDelta::FromSecondsD(currentPlaybackTime),
       newDataSize);
 }
 
 void WebSourceBufferImpl::append(
     const unsigned char* data,
     unsigned length,
     double* timestamp_offset) {
   base::TimeDelta old_offset = timestamp_offset_;
-  demuxer_->AppendData(id_, data, length,
-                       append_window_start_, append_window_end_,
-                       &timestamp_offset_,
-                       base::Bind(&WebSourceBufferImpl::InitSegmentReceived,
-                                  base::Unretained(this)));
+  demuxer_->AppendData(id_, data, length, append_window_start_,
+                       append_window_end_, &timestamp_offset_);
 
   // Coded frame processing may update the timestamp offset. If the caller
   // provides a non-NULL |timestamp_offset| and frame processing changes the
   // timestamp offset, report the new offset to the caller. Do not update the
   // caller's offset otherwise, to preserve any pre-existing value that may have
   // more than microsecond precision.
   if (timestamp_offset && old_offset != timestamp_offset_)
     *timestamp_offset = timestamp_offset_.InSecondsF();
 }
 
@@ skipping 35 matching lines @@
   DCHECK_GE(end, 0);
   append_window_end_ = DoubleToTimeDelta(end);
 }
 
 void WebSourceBufferImpl::removedFromMediaSource() {
   demuxer_->RemoveId(id_);
   demuxer_ = NULL;
   client_ = NULL;
 }
 
-void WebSourceBufferImpl::InitSegmentReceived(const MediaTracks& tracks) {
+void WebSourceBufferImpl::InitSegmentReceived(scoped_ptr<MediaTracks> tracks) {
   DVLOG(1) << __FUNCTION__;
   // TODO(servolk): Implement passing MediaTrack info to blink level.
   // https://crbug.com/249428
   client_->initializationSegmentReceived();
 }
 
 }  // namespace media