MediaResource refactoring to support multiple streams

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"
 #include "base/optional.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/content_decryption_module.h"
 #include "media/base/media_url_demuxer.h"
 #include "media/base/renderer.h"
 #include "media/base/video_renderer_sink.h"
-#include "media/mojo/services/demuxer_stream_provider_shim.h"
+#include "media/mojo/services/media_resource_shim.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
 
 namespace media {
 
 namespace {
 
 void CloseBindingOnBadMessage(mojo::StrongBindingPtr<mojom::Renderer> binding) {
   LOG(ERROR) << __func__;
   DCHECK(binding);
   binding->Close();
@@ skipping 54 matching lines @@
     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(
+    media_resource_.reset(new MediaResourceShim(
         std::move(*streams),
         base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
     return;
   }
 
   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()));
+  media_resource_.reset(new MediaUrlDemuxer(nullptr, media_url.value(),
+                                            first_party_for_cookies.value()));
   renderer_->Initialize(
-      stream_provider_.get(), this,
+      media_resource_.get(), this,
       base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
                  callback));
 }
 
 void MojoRendererService::Flush(const FlushCallback& callback) {
   DVLOG(2) << __func__;
   DCHECK_EQ(state_, STATE_PLAYING);
 
   state_ = STATE_FLUSHING;
   CancelPeriodicMediaTimeUpdates();
@@ skipping 84 matching lines @@
 void MojoRendererService::OnVideoOpacityChange(bool opaque) {
   DVLOG(2) << __func__ << "(" << opaque << ")";
   client_->OnVideoOpacityChange(opaque);
 }
 
 void MojoRendererService::OnStreamReady(
     const base::Callback<void(bool)>& callback) {
   DCHECK_EQ(state_, STATE_INITIALIZING);
 
   renderer_->Initialize(
-      stream_provider_.get(), this,
+      media_resource_.get(), this,
       base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
                  callback));
 }
 
 void MojoRendererService::OnRendererInitializeDone(
     const base::Callback<void(bool)>& callback,
     PipelineStatus status) {
   DVLOG(1) << __func__;
   DCHECK_EQ(state_, STATE_INITIALIZING);
 
@@ skipping 67 matching lines @@
     DCHECK(!bad_message_cb_.is_null());
     bad_message_cb_.Run();
 
     return;
   }
 
   callback.Run(initiate_surface_request_cb_.Run());
 }
 
 }  // namespace media