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

Side by Side Diff: media/cdm/ppapi/cdm_adapter.h

Issue 26155003: Add CdmWrapper to support multiple CDM versions in CdmAdapter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_adapter.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_CDM_PPAPI_CDM_ADAPTER_H_ 5 #ifndef MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "media/cdm/ppapi/api/content_decryption_module.h" 13 #include "media/cdm/ppapi/api/content_decryption_module.h"
14 #include "media/cdm/ppapi/cdm_helpers.h" 14 #include "media/cdm/ppapi/cdm_helpers.h"
15 #include "media/cdm/ppapi/cdm_wrapper.h"
15 #include "media/cdm/ppapi/linked_ptr.h" 16 #include "media/cdm/ppapi/linked_ptr.h"
16 #include "ppapi/c/pp_stdint.h" 17 #include "ppapi/c/pp_stdint.h"
17 #include "ppapi/c/private/pp_content_decryptor.h" 18 #include "ppapi/c/private/pp_content_decryptor.h"
18 #include "ppapi/cpp/completion_callback.h" 19 #include "ppapi/cpp/completion_callback.h"
19 #include "ppapi/cpp/private/content_decryptor_private.h" 20 #include "ppapi/cpp/private/content_decryptor_private.h"
20 #include "ppapi/cpp/var.h" 21 #include "ppapi/cpp/var.h"
21 #include "ppapi/cpp/var_array_buffer.h" 22 #include "ppapi/cpp/var_array_buffer.h"
22 #include "ppapi/utility/completion_callback_factory.h" 23 #include "ppapi/utility/completion_callback_factory.h"
23 24
24 namespace media { 25 namespace media {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 const LinkedAudioFrames& audio_frames, 148 const LinkedAudioFrames& audio_frames,
148 const PP_DecryptTrackingInfo& tracking_info); 149 const PP_DecryptTrackingInfo& tracking_info);
149 150
150 // Helper for SetTimer(). 151 // Helper for SetTimer().
151 void TimerExpired(int32_t result, void* context); 152 void TimerExpired(int32_t result, void* context);
152 153
153 bool IsValidVideoFrame(const LinkedVideoFrame& video_frame); 154 bool IsValidVideoFrame(const LinkedVideoFrame& video_frame);
154 155
155 PpbBufferAllocator allocator_; 156 PpbBufferAllocator allocator_;
156 pp::CompletionCallbackFactory<CdmAdapter> callback_factory_; 157 pp::CompletionCallbackFactory<CdmAdapter> callback_factory_;
157 cdm::ContentDecryptionModule* cdm_; 158 linked_ptr<CdmWrapper> cdm_;
158 std::string key_system_; 159 std::string key_system_;
159 160
160 DISALLOW_COPY_AND_ASSIGN(CdmAdapter); 161 DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
161 }; 162 };
162 163
163 } // namespace media 164 } // namespace media
164 165
165 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 166 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
OLDNEW
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698