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

Side by Side Diff: webkit/media/webmediaplayer_impl.h

Issue 10796074: Move VideoRenderer out of Filter heirarchy. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 8 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 #include <string> 51 #include <string>
52 52
53 #include "base/memory/ref_counted.h" 53 #include "base/memory/ref_counted.h"
54 #include "base/memory/scoped_ptr.h" 54 #include "base/memory/scoped_ptr.h"
55 #include "base/memory/weak_ptr.h" 55 #include "base/memory/weak_ptr.h"
56 #include "base/message_loop.h" 56 #include "base/message_loop.h"
57 #include "googleurl/src/gurl.h" 57 #include "googleurl/src/gurl.h"
58 #include "media/base/audio_renderer_sink.h" 58 #include "media/base/audio_renderer_sink.h"
59 #include "media/base/decryptor.h" 59 #include "media/base/decryptor.h"
60 #include "media/base/filters.h"
61 #include "media/base/message_loop_factory.h" 60 #include "media/base/message_loop_factory.h"
62 #include "media/base/pipeline.h" 61 #include "media/base/pipeline.h"
63 #include "skia/ext/platform_canvas.h" 62 #include "skia/ext/platform_canvas.h"
64 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvide r.h" 63 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvide r.h"
65 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" 64 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
66 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h" 65 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"
67 #include "webkit/media/crypto/key_systems.h" 66 #include "webkit/media/crypto/key_systems.h"
68 #include "webkit/media/crypto/proxy_decryptor.h" 67 #include "webkit/media/crypto/proxy_decryptor.h"
69 68
70 class RenderAudioSourceProvider; 69 class RenderAudioSourceProvider;
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 354
356 // The decryptor that manages decryption keys and decrypts encrypted frames. 355 // The decryptor that manages decryption keys and decrypts encrypted frames.
357 ProxyDecryptor decryptor_; 356 ProxyDecryptor decryptor_;
358 357
359 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 358 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
360 }; 359 };
361 360
362 } // namespace webkit_media 361 } // namespace webkit_media
363 362
364 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 363 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« media/filters/video_renderer_base_unittest.cc ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698