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

Side by Side Diff: media/mojo/services/service_factory_impl.cc

Issue 1824763002: Get CdmContext in MojoAudioDecoderService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@spitzer-audio-serialize
Patch Set: Rebased, fixed typo in a comment Created 4 years, 9 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
« no previous file with comments | « media/mojo/services/mojo_audio_decoder_service.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "media/mojo/services/service_factory_impl.h" 5 #include "media/mojo/services/service_factory_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/cdm_factory.h" 8 #include "media/base/cdm_factory.h"
9 #include "media/base/media_log.h" 9 #include "media/base/media_log.h"
10 #include "media/base/renderer_factory.h" 10 #include "media/base/renderer_factory.h"
(...skipping 30 matching lines...) Expand all
41 scoped_refptr<base::SingleThreadTaskRunner> task_runner( 41 scoped_refptr<base::SingleThreadTaskRunner> task_runner(
42 base::MessageLoop::current()->task_runner()); 42 base::MessageLoop::current()->task_runner());
43 43
44 scoped_ptr<AudioDecoder> audio_decoder = 44 scoped_ptr<AudioDecoder> audio_decoder =
45 mojo_media_client_->CreateAudioDecoder(task_runner); 45 mojo_media_client_->CreateAudioDecoder(task_runner);
46 if (!audio_decoder) { 46 if (!audio_decoder) {
47 LOG(ERROR) << "AudioDecoder creation failed."; 47 LOG(ERROR) << "AudioDecoder creation failed.";
48 return; 48 return;
49 } 49 }
50 50
51 new MojoAudioDecoderService(std::move(audio_decoder), std::move(request)); 51 new MojoAudioDecoderService(cdm_service_context_.GetWeakPtr(),
52 std::move(audio_decoder), std::move(request));
52 } 53 }
53 54
54 void ServiceFactoryImpl::CreateRenderer( 55 void ServiceFactoryImpl::CreateRenderer(
55 mojo::InterfaceRequest<interfaces::Renderer> request) { 56 mojo::InterfaceRequest<interfaces::Renderer> request) {
56 // The created object is owned by the pipe. 57 // The created object is owned by the pipe.
57 // The audio and video sinks are owned by the client. 58 // The audio and video sinks are owned by the client.
58 scoped_refptr<base::SingleThreadTaskRunner> task_runner( 59 scoped_refptr<base::SingleThreadTaskRunner> task_runner(
59 base::MessageLoop::current()->task_runner()); 60 base::MessageLoop::current()->task_runner());
60 AudioRendererSink* audio_renderer_sink = 61 AudioRendererSink* audio_renderer_sink =
61 mojo_media_client_->CreateAudioRendererSink(); 62 mojo_media_client_->CreateAudioRendererSink();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 100
100 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { 101 CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
101 if (!cdm_factory_) { 102 if (!cdm_factory_) {
102 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_); 103 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_);
103 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; 104 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available.";
104 } 105 }
105 return cdm_factory_.get(); 106 return cdm_factory_.get();
106 } 107 }
107 108
108 } // namespace media 109 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_audio_decoder_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698