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

Side by Side Diff: components/html_viewer/media_factory.h

Issue 1399603003: Tie multibuffers to URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_cache
Patch Set: added MEDIA_BLINK_EXPORT Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_
6 #define COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_ 6 #define COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/linked_ptr.h"
9 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
11 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
12 #include "media/audio/fake_audio_log_factory.h" 13 #include "media/audio/fake_audio_log_factory.h"
13 #include "media/base/audio_hardware_config.h" 14 #include "media/base/audio_hardware_config.h"
15 #include "media/blink/resource_multibuffer.h"
14 #include "media/mojo/interfaces/service_factory.mojom.h" 16 #include "media/mojo/interfaces/service_factory.mojom.h"
15 #include "mojo/application/public/interfaces/service_provider.mojom.h" 17 #include "mojo/application/public/interfaces/service_provider.mojom.h"
16 18
17 namespace base { 19 namespace base {
18 class SingleThreadTaskRunner; 20 class SingleThreadTaskRunner;
19 } 21 }
20 22
21 namespace blink { 23 namespace blink {
22 class WebContentDecryptionModule; 24 class WebContentDecryptionModule;
23 class WebEncryptedMediaClient; 25 class WebEncryptedMediaClient;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 const bool enable_mojo_media_renderer_; 84 const bool enable_mojo_media_renderer_;
83 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; 85 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
84 mojo::Shell* shell_; 86 mojo::Shell* shell_;
85 87
86 // Lazily initialized objects. 88 // Lazily initialized objects.
87 media::interfaces::ServiceFactoryPtr media_service_factory_; 89 media::interfaces::ServiceFactoryPtr media_service_factory_;
88 scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_; 90 scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_;
89 scoped_ptr<media::MediaPermission> media_permission_; 91 scoped_ptr<media::MediaPermission> media_permission_;
90 scoped_ptr<media::CdmFactory> cdm_factory_; 92 scoped_ptr<media::CdmFactory> cdm_factory_;
91 93
94 // Media resource cache, lazily initialized.
95 linked_ptr<media::ResourceMultiBuffer> resource_multibuffer_;
96
92 DISALLOW_COPY_AND_ASSIGN(MediaFactory); 97 DISALLOW_COPY_AND_ASSIGN(MediaFactory);
93 }; 98 };
94 99
95 } // namespace html_viewer 100 } // namespace html_viewer
96 101
97 #endif // COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_ 102 #endif // COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/media_factory.cc » ('j') | components/html_viewer/media_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698