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

Side by Side Diff: media/remoting/rpc/proto_utils.h

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
« no previous file with comments | « media/remoting/rpc/proto_enum_utils.cc ('k') | media/remoting/rpc/proto_utils.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 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 #ifndef MEDIA_REMOTING_RPC_PROTO_UTILS_H_ 5 #ifndef MEDIA_REMOTING_RPC_PROTO_UTILS_H_
6 #define MEDIA_REMOTING_RPC_PROTO_UTILS_H_ 6 #define MEDIA_REMOTING_RPC_PROTO_UTILS_H_
7 7
8 #include <cstdint> 8 #include <cstdint>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "media/base/audio_decoder_config.h" 14 #include "media/base/audio_decoder_config.h"
15 #include "media/base/cdm_config.h" 15 #include "media/base/cdm_config.h"
16 #include "media/base/cdm_key_information.h" 16 #include "media/base/cdm_key_information.h"
17 #include "media/base/cdm_promise.h" 17 #include "media/base/cdm_promise.h"
18 #include "media/base/decoder_buffer.h" 18 #include "media/base/decoder_buffer.h"
19 #include "media/base/demuxer_stream.h" 19 #include "media/base/demuxer_stream.h"
20 #include "media/base/eme_constants.h" 20 #include "media/base/eme_constants.h"
21 #include "media/base/media_keys.h"
22 #include "media/base/pipeline_status.h" 21 #include "media/base/pipeline_status.h"
23 #include "media/base/video_decoder_config.h" 22 #include "media/base/video_decoder_config.h"
24 #include "media/remoting/remoting_rpc_message.pb.h" 23 #include "media/remoting/remoting_rpc_message.pb.h"
25 24
26 namespace media { 25 namespace media {
27 namespace remoting { 26 namespace remoting {
28 27
29 class CdmPromiseResult; 28 class CdmPromiseResult;
30 29
31 // Utility class to convert data between ::media::DecoderBuffer and byte array. 30 // Utility class to convert data between ::media::DecoderBuffer and byte array.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 bool success_; 122 bool success_;
124 ::media::CdmPromise::Exception exception_; 123 ::media::CdmPromise::Exception exception_;
125 uint32_t system_code_; 124 uint32_t system_code_;
126 std::string error_message_; 125 std::string error_message_;
127 }; 126 };
128 127
129 } // namespace remoting 128 } // namespace remoting
130 } // namespace media 129 } // namespace media
131 130
132 #endif // MEDIA_REMOTING_RPC_PROTO_UTILS_H_ 131 #endif // MEDIA_REMOTING_RPC_PROTO_UTILS_H_
OLDNEW
« no previous file with comments | « media/remoting/rpc/proto_enum_utils.cc ('k') | media/remoting/rpc/proto_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698