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

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

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 years 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 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/mojo_decryptor_service.h" 5 #include "media/mojo/services/mojo_decryptor_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/numerics/safe_conversions.h" 10 #include "base/numerics/safe_conversions.h"
11 #include "media/base/audio_decoder_config.h" 11 #include "media/base/audio_decoder_config.h"
12 #include "media/base/cdm_context.h" 12 #include "media/base/cdm_context.h"
13 #include "media/base/content_decryption_module.h"
13 #include "media/base/decoder_buffer.h" 14 #include "media/base/decoder_buffer.h"
14 #include "media/base/decryptor.h" 15 #include "media/base/decryptor.h"
15 #include "media/base/media_keys.h"
16 #include "media/base/video_decoder_config.h" 16 #include "media/base/video_decoder_config.h"
17 #include "media/base/video_frame.h" 17 #include "media/base/video_frame.h"
18 #include "media/mojo/common/media_type_converters.h" 18 #include "media/mojo/common/media_type_converters.h"
19 #include "media/mojo/common/mojo_decoder_buffer_converter.h" 19 #include "media/mojo/common/mojo_decoder_buffer_converter.h"
20 #include "media/mojo/common/mojo_shared_buffer_video_frame.h" 20 #include "media/mojo/common/mojo_shared_buffer_video_frame.h"
21 #include "media/mojo/interfaces/demuxer_stream.mojom.h" 21 #include "media/mojo/interfaces/demuxer_stream.mojom.h"
22 22
23 namespace media { 23 namespace media {
24 24
25 MojoDecryptorService::MojoDecryptorService( 25 MojoDecryptorService::MojoDecryptorService(
26 const scoped_refptr<MediaKeys>& cdm, 26 const scoped_refptr<ContentDecryptionModule>& cdm,
27 mojo::InterfaceRequest<mojom::Decryptor> request, 27 mojo::InterfaceRequest<mojom::Decryptor> request,
28 const base::Closure& error_handler) 28 const base::Closure& error_handler)
29 : binding_(this, std::move(request)), cdm_(cdm), weak_factory_(this) { 29 : binding_(this, std::move(request)), cdm_(cdm), weak_factory_(this) {
30 DVLOG(1) << __func__; 30 DVLOG(1) << __func__;
31 decryptor_ = cdm->GetCdmContext()->GetDecryptor(); 31 decryptor_ = cdm->GetCdmContext()->GetDecryptor();
32 DCHECK(decryptor_); 32 DCHECK(decryptor_);
33 weak_this_ = weak_factory_.GetWeakPtr(); 33 weak_this_ = weak_factory_.GetWeakPtr();
34 binding_.set_connection_error_handler(error_handler); 34 binding_.set_connection_error_handler(error_handler);
35 } 35 }
36 36
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 MojoSharedBufferVideoFrame* mojo_frame = 222 MojoSharedBufferVideoFrame* mojo_frame =
223 static_cast<MojoSharedBufferVideoFrame*>(frame.get()); 223 static_cast<MojoSharedBufferVideoFrame*>(frame.get());
224 in_use_video_frames_.insert( 224 in_use_video_frames_.insert(
225 std::make_pair(mojo_frame->Handle().value(), frame)); 225 std::make_pair(mojo_frame->Handle().value(), frame));
226 } 226 }
227 227
228 callback.Run(status, mojom::VideoFrame::From(frame)); 228 callback.Run(status, mojom::VideoFrame::From(frame));
229 } 229 }
230 230
231 } // namespace media 231 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_decryptor_service.h ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698