Make mojo renderer capable of supporting multiple streams/tracks

media/mojo/services/mojo_renderer_service.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/mojo/services/mojo_renderer_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 59 matching lines @@
   DVLOG(1) << __func__;
   DCHECK(renderer_);
 
   weak_this_ = weak_factory_.GetWeakPtr();
 }
 
 MojoRendererService::~MojoRendererService() {}
 
 void MojoRendererService::Initialize(
     mojom::RendererClientAssociatedPtrInfo client,
-    mojom::DemuxerStreamPtr audio,
-    mojom::DemuxerStreamPtr video,
+    base::Optional<std::vector<mojom::DemuxerStreamPtr>> streams,
     const base::Optional<GURL>& media_url,
     const base::Optional<GURL>& first_party_for_cookies,
     const InitializeCallback& callback) {
   DVLOG(1) << __func__;
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
 
   client_.Bind(std::move(client));
   state_ = STATE_INITIALIZING;
 
   if (media_url == base::nullopt) {
+    DCHECK(streams.has_value());
     stream_provider_.reset(new DemuxerStreamProviderShim(
-        std::move(audio), std::move(video),
+        std::move(*streams),
         base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
     return;
   }
 
-  DCHECK(!audio);
-  DCHECK(!video);
   DCHECK(!media_url.value().is_empty());
   DCHECK(first_party_for_cookies);
   stream_provider_.reset(new MediaUrlDemuxer(nullptr, media_url.value(),
                                              first_party_for_cookies.value()));
   renderer_->Initialize(
       stream_provider_.get(), this,
       base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
                  callback));
 }
 
@@ skipping 178 matching lines @@
     DCHECK(!bad_message_cb_.is_null());
     bad_message_cb_.Run();
 
     return;
   }
 
   callback.Run(initiate_surface_request_cb_.Run());
 }
 
 }  // namespace media