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

Side by Side Diff: media/mojo/clients/mojo_decryptor.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/clients/mojo_decoder_factory.cc ('k') | media/mojo/clients/mojo_renderer_factory.cc » ('j') | 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/clients/mojo_decryptor.h" 5 #include "media/mojo/clients/mojo_decryptor.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/numerics/safe_conversions.h" 13 #include "base/numerics/safe_conversions.h"
14 #include "media/base/audio_buffer.h" 14 #include "media/base/audio_buffer.h"
15 #include "media/base/decoder_buffer.h" 15 #include "media/base/decoder_buffer.h"
16 #include "media/base/video_frame.h" 16 #include "media/base/video_frame.h"
17 #include "media/mojo/common/media_type_converters.h" 17 #include "media/mojo/common/media_type_converters.h"
18 #include "media/mojo/common/mojo_decoder_buffer_converter.h" 18 #include "media/mojo/common/mojo_decoder_buffer_converter.h"
19 #include "media/mojo/common/mojo_shared_buffer_video_frame.h" 19 #include "media/mojo/common/mojo_shared_buffer_video_frame.h"
20 #include "media/mojo/interfaces/decryptor.mojom.h" 20 #include "media/mojo/interfaces/decryptor.mojom.h"
21 #include "services/shell/public/cpp/connect.h" 21 #include "services/service_manager/public/cpp/connect.h"
22 22
23 namespace media { 23 namespace media {
24 24
25 MojoDecryptor::MojoDecryptor(mojom::DecryptorPtr remote_decryptor) 25 MojoDecryptor::MojoDecryptor(mojom::DecryptorPtr remote_decryptor)
26 : remote_decryptor_(std::move(remote_decryptor)), weak_factory_(this) { 26 : remote_decryptor_(std::move(remote_decryptor)), weak_factory_(this) {
27 DVLOG(1) << __FUNCTION__; 27 DVLOG(1) << __FUNCTION__;
28 28
29 // Allocate DataPipe size based on video content. 29 // Allocate DataPipe size based on video content.
30 30
31 mojo::ScopedDataPipeConsumerHandle remote_consumer_handle; 31 mojo::ScopedDataPipeConsumerHandle remote_consumer_handle;
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 void MojoDecryptor::ReleaseSharedBuffer(mojo::ScopedSharedBufferHandle buffer, 234 void MojoDecryptor::ReleaseSharedBuffer(mojo::ScopedSharedBufferHandle buffer,
235 size_t buffer_size) { 235 size_t buffer_size) {
236 DVLOG(1) << __FUNCTION__; 236 DVLOG(1) << __FUNCTION__;
237 DCHECK(thread_checker_.CalledOnValidThread()); 237 DCHECK(thread_checker_.CalledOnValidThread());
238 238
239 remote_decryptor_->ReleaseSharedBuffer(std::move(buffer), buffer_size); 239 remote_decryptor_->ReleaseSharedBuffer(std::move(buffer), buffer_size);
240 } 240 }
241 241
242 } // namespace media 242 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/clients/mojo_decoder_factory.cc ('k') | media/mojo/clients/mojo_renderer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698