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: content/renderer/media/crypto/render_cdm_factory.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unittest. Created 5 years, 7 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
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 CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/threading/thread_checker.h" 11 #include "base/threading/thread_checker.h"
12 #include "content/public/renderer/render_frame_observer.h" 12 #include "content/public/renderer/render_frame_observer.h"
13 #include "media/base/cdm_factory.h" 13 #include "media/base/cdm_factory.h"
14 #include "media/base/media_keys.h" 14 #include "media/base/media_keys.h"
15 15
16 #if defined(ENABLE_PEPPER_CDMS) 16 #if defined(ENABLE_PEPPER_CDMS)
17 #include "content/renderer/media/crypto/pepper_cdm_wrapper.h" 17 #include "content/renderer/media/crypto/pepper_cdm_wrapper.h"
18 #endif 18 #endif
19 19
20 class GURL; 20 class GURL;
21 21
22 namespace media {
23 struct CdmConfig;
24 } // namespace media
25
22 namespace content { 26 namespace content {
23 27
24 #if defined(ENABLE_BROWSER_CDMS) 28 #if defined(ENABLE_BROWSER_CDMS)
25 class RendererCdmManager; 29 class RendererCdmManager;
26 #endif 30 #endif
27 31
28 // CdmFactory implementation in content/renderer. This class is not thread safe 32 // CdmFactory implementation in content/renderer. This class is not thread safe
29 // and should only be used on one thread. 33 // and should only be used on one thread.
30 class RenderCdmFactory : public media::CdmFactory, public RenderFrameObserver { 34 class RenderCdmFactory : public media::CdmFactory, public RenderFrameObserver {
31 public: 35 public:
32 RenderCdmFactory( 36 RenderCdmFactory(
33 #if defined(ENABLE_PEPPER_CDMS) 37 #if defined(ENABLE_PEPPER_CDMS)
34 const CreatePepperCdmCB& create_pepper_cdm_cb, 38 const CreatePepperCdmCB& create_pepper_cdm_cb,
35 #elif defined(ENABLE_BROWSER_CDMS) 39 #elif defined(ENABLE_BROWSER_CDMS)
36 RendererCdmManager* manager, 40 RendererCdmManager* manager,
37 #endif // defined(ENABLE_PEPPER_CDMS) 41 #endif // defined(ENABLE_PEPPER_CDMS)
38 RenderFrame* render_frame); 42 RenderFrame* render_frame);
39 43
40 ~RenderCdmFactory() override; 44 ~RenderCdmFactory() override;
41 45
42 // CdmFactory implementation. 46 // CdmFactory implementation.
43 void Create( 47 void Create(
44 const std::string& key_system, 48 const std::string& key_system,
45 bool allow_distinctive_identifier,
46 bool allow_persistent_state,
47 const GURL& security_origin, 49 const GURL& security_origin,
50 const media::CdmConfig& cdm_config,
48 const media::SessionMessageCB& session_message_cb, 51 const media::SessionMessageCB& session_message_cb,
49 const media::SessionClosedCB& session_closed_cb, 52 const media::SessionClosedCB& session_closed_cb,
50 const media::LegacySessionErrorCB& legacy_session_error_cb, 53 const media::LegacySessionErrorCB& legacy_session_error_cb,
51 const media::SessionKeysChangeCB& session_keys_change_cb, 54 const media::SessionKeysChangeCB& session_keys_change_cb,
52 const media::SessionExpirationUpdateCB& session_expiration_update_cb, 55 const media::SessionExpirationUpdateCB& session_expiration_update_cb,
53 const media::CdmCreatedCB& cdm_created_cb) override; 56 const media::CdmCreatedCB& cdm_created_cb) override;
54 57
55 private: 58 private:
56 #if defined(ENABLE_PEPPER_CDMS) 59 #if defined(ENABLE_PEPPER_CDMS)
57 CreatePepperCdmCB create_pepper_cdm_cb_; 60 CreatePepperCdmCB create_pepper_cdm_cb_;
58 #elif defined(ENABLE_BROWSER_CDMS) 61 #elif defined(ENABLE_BROWSER_CDMS)
59 // The |manager_| is a per render frame object owned by RenderFrameImpl. 62 // The |manager_| is a per render frame object owned by RenderFrameImpl.
60 RendererCdmManager* manager_; 63 RendererCdmManager* manager_;
61 #endif 64 #endif
62 65
63 base::ThreadChecker thread_checker_; 66 base::ThreadChecker thread_checker_;
64 67
65 DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory); 68 DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory);
66 }; 69 };
67 70
68 } // namespace content 71 } // namespace content
69 72
70 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_ 73 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698