Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Side by Side Diff: content/renderer/media/media_interface_provider.cc

Issue 1899363002: Finish plumbing MojoVideoDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_interface_provider.h" 5 #include "content/renderer/media/media_interface_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 8 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
9 #include "media/mojo/interfaces/renderer.mojom.h" 9 #include "media/mojo/interfaces/renderer.mojom.h"
10 #include "mojo/public/cpp/bindings/interface_request.h" 10 #include "mojo/public/cpp/bindings/interface_request.h"
(...skipping 19 matching lines...) Expand all
30 if (interface_name == media::interfaces::ContentDecryptionModule::Name_) { 30 if (interface_name == media::interfaces::ContentDecryptionModule::Name_) {
31 GetMediaServiceFactory()->CreateCdm( 31 GetMediaServiceFactory()->CreateCdm(
32 mojo::MakeRequest<media::interfaces::ContentDecryptionModule>( 32 mojo::MakeRequest<media::interfaces::ContentDecryptionModule>(
33 std::move(pipe))); 33 std::move(pipe)));
34 } else if (interface_name == media::interfaces::Renderer::Name_) { 34 } else if (interface_name == media::interfaces::Renderer::Name_) {
35 GetMediaServiceFactory()->CreateRenderer( 35 GetMediaServiceFactory()->CreateRenderer(
36 mojo::MakeRequest<media::interfaces::Renderer>(std::move(pipe))); 36 mojo::MakeRequest<media::interfaces::Renderer>(std::move(pipe)));
37 } else if (interface_name == media::interfaces::AudioDecoder::Name_) { 37 } else if (interface_name == media::interfaces::AudioDecoder::Name_) {
38 GetMediaServiceFactory()->CreateAudioDecoder( 38 GetMediaServiceFactory()->CreateAudioDecoder(
39 mojo::MakeRequest<media::interfaces::AudioDecoder>(std::move(pipe))); 39 mojo::MakeRequest<media::interfaces::AudioDecoder>(std::move(pipe)));
40 } else if (interface_name == media::interfaces::VideoDecoder::Name_) {
41 GetMediaServiceFactory()->CreateVideoDecoder(
42 mojo::MakeRequest<media::interfaces::VideoDecoder>(std::move(pipe)));
40 } else { 43 } else {
41 NOTREACHED(); 44 NOTREACHED();
42 } 45 }
43 } 46 }
44 47
45 media::interfaces::ServiceFactory* 48 media::interfaces::ServiceFactory*
46 MediaInterfaceProvider::GetMediaServiceFactory() { 49 MediaInterfaceProvider::GetMediaServiceFactory() {
47 DVLOG(1) << __FUNCTION__; 50 DVLOG(1) << __FUNCTION__;
48 DCHECK(thread_checker_.CalledOnValidThread()); 51 DCHECK(thread_checker_.CalledOnValidThread());
49 52
50 if (!media_service_factory_) { 53 if (!media_service_factory_) {
51 shell::mojom::InterfaceProviderPtr interface_provider = 54 shell::mojom::InterfaceProviderPtr interface_provider =
52 connect_to_app_cb_.Run(GURL("mojo:media")); 55 connect_to_app_cb_.Run(GURL("mojo:media"));
53 shell::GetInterface(interface_provider.get(), &media_service_factory_); 56 shell::GetInterface(interface_provider.get(), &media_service_factory_);
54 media_service_factory_.set_connection_error_handler(base::Bind( 57 media_service_factory_.set_connection_error_handler(base::Bind(
55 &MediaInterfaceProvider::OnConnectionError, base::Unretained(this))); 58 &MediaInterfaceProvider::OnConnectionError, base::Unretained(this)));
56 } 59 }
57 60
58 return media_service_factory_.get(); 61 return media_service_factory_.get();
59 } 62 }
60 63
61 void MediaInterfaceProvider::OnConnectionError() { 64 void MediaInterfaceProvider::OnConnectionError() {
62 DVLOG(1) << __FUNCTION__; 65 DVLOG(1) << __FUNCTION__;
63 DCHECK(thread_checker_.CalledOnValidThread()); 66 DCHECK(thread_checker_.CalledOnValidThread());
64 67
65 media_service_factory_.reset(); 68 media_service_factory_.reset();
66 } 69 }
67 70
68 } // namespace content 71 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698