Implemented passing media track info from ffmpeg into blink

media/blink/webmediaplayer_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/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 825 matching lines @@
   }
 
   // TODO(xhwang): Update this UMA name.
   UMA_HISTOGRAM_COUNTS("Media.EME.NeedKey", 1);
 
   encrypted_client_->encrypted(
       ConvertToWebInitDataType(init_data_type), init_data.data(),
       base::saturated_cast<unsigned int>(init_data.size()));
 }
 
+void WebMediaPlayerImpl::OnMediaTracksUpdated(scoped_ptr<MediaTracks> tracks) {
+  // For MSE/chunk_demuxer case the media tracks should be handled by WSBI
+  DCHECK(!chunk_demuxer_);
+  DCHECK(client_);
+
+  // Remove the old tracks first, if any were present
+  while (!blink_audio_tracks_.empty()) {
+    client_->removeAudioTrack(blink_audio_tracks_[0]);
+    blink_audio_tracks_.erase(blink_audio_tracks_.begin());
+  }
+  while (!blink_video_tracks_.empty()) {
+    client_->removeVideoTrack(blink_video_tracks_[0]);
+    blink_audio_tracks_.erase(blink_audio_tracks_.begin());
+  }
+
+  // Now report the new media tracks to blink
+  for (const auto& track : tracks->tracks()) {
+    if (track->type() == MediaTrack::Audio) {
+      auto track_id = client_->addAudioTrack(
+          blink::WebString::fromUTF8(track->id()),
+          blink::WebMediaPlayerClient::AudioTrackKindMain,
+          blink::WebString::fromUTF8(track->label()),
+          blink::WebString::fromUTF8(track->language()),
+          /*enabled*/ true);
+      blink_audio_tracks_.push_back(track_id);
+    } else if (track->type() == MediaTrack::Video) {
+      auto track_id = client_->addVideoTrack(
+          blink::WebString::fromUTF8(track->id()),
+          blink::WebMediaPlayerClient::VideoTrackKindMain,
+          blink::WebString::fromUTF8(track->label()),
+          blink::WebString::fromUTF8(track->language()),
+          /*selected*/ true);
+      blink_video_tracks_.push_back(track_id);
+    } else {
+      // Text tracks are not supported yet.
+      NOTREACHED();
+    }
+  }
+}
+
 void WebMediaPlayerImpl::OnWaitingForDecryptionKey() {
   encrypted_client_->didBlockPlaybackWaitingForKey();
 
   // TODO(jrummell): didResumePlaybackBlockedForKey() should only be called
   // when a key has been successfully added (e.g. OnSessionKeysChange() with
   // |has_additional_usable_key| = true). http://crbug.com/461903
   encrypted_client_->didResumePlaybackBlockedForKey();
 }
 
 void WebMediaPlayerImpl::SetCdm(const CdmAttachedCB& cdm_attached_cb,
@@ skipping 508 matching lines @@
       media_task_runner_, worker_task_runner_, audio_source_provider_.get(),
       compositor_, request_surface_cb);
 }
 
 void WebMediaPlayerImpl::StartPipeline() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb =
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnEncryptedMediaInitData);
 
+  Demuxer::MediaTracksUpdatedCB media_tracks_updated_cb =
+      BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnMediaTracksUpdated);
+
   // Figure out which demuxer to use.
   if (load_type_ != LoadTypeMediaSource) {
     DCHECK(!chunk_demuxer_);
     DCHECK(data_source_);
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
     demuxer_.reset(new FFmpegDemuxer(media_task_runner_, data_source_.get(),
-                                     encrypted_media_init_data_cb, media_log_));
+                                     encrypted_media_init_data_cb,
+                                     media_tracks_updated_cb, media_log_));
 #else
     OnPipelineError(PipelineStatus::DEMUXER_ERROR_COULD_NOT_OPEN);
     return;
 #endif
   } else {
     DCHECK(!chunk_demuxer_);
     DCHECK(!data_source_);
 
     chunk_demuxer_ = new ChunkDemuxer(
         BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
@@ skipping 188 matching lines @@
            << ", Video: " << stats.video_memory_usage << ", DataSource: "
            << (data_source_ ? data_source_->GetMemoryUsage() : 0)
            << ", Demuxer: " << demuxer_memory_usage;
 
   const int64_t delta = current_memory_usage - last_reported_memory_usage_;
   last_reported_memory_usage_ = current_memory_usage;
   adjust_allocated_memory_cb_.Run(delta);
 }
 
 }  // namespace media