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

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

Issue 10834183: Remove WebMediaPlayerProxy::video_decoder_ & FFmpegVideoDecoder::set_decryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed CR comments Created 8 years, 4 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 | « media/tools/player_x11/player_x11.cc ('k') | webkit/media/filter_helpers.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 (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 #ifndef WEBKIT_MEDIA_FILTER_HELPERS_H_ 5 #ifndef WEBKIT_MEDIA_FILTER_HELPERS_H_
6 #define WEBKIT_MEDIA_FILTER_HELPERS_H_ 6 #define WEBKIT_MEDIA_FILTER_HELPERS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 10
(...skipping 26 matching lines...) Expand all
37 // Builds the required filters for handling media source URLs, adds them to 37 // Builds the required filters for handling media source URLs, adds them to
38 // |filter_collection| and fills |video_decoder| returning true if successful. 38 // |filter_collection| and fills |video_decoder| returning true if successful.
39 // 39 //
40 // |filter_collection| is not modified if this method returns false. 40 // |filter_collection| is not modified if this method returns false.
41 bool BuildMediaSourceCollection( 41 bool BuildMediaSourceCollection(
42 const WebKit::WebURL& url, 42 const WebKit::WebURL& url,
43 const WebKit::WebURL& media_source_url, 43 const WebKit::WebURL& media_source_url,
44 media::ChunkDemuxerClient* client, 44 media::ChunkDemuxerClient* client,
45 media::MessageLoopFactory* message_loop_factory, 45 media::MessageLoopFactory* message_loop_factory,
46 media::FilterCollection* filter_collection, 46 media::FilterCollection* filter_collection,
47 media::Decryptor* decryptor, 47 media::Decryptor* decryptor);
48 scoped_refptr<media::FFmpegVideoDecoder>* video_decoder);
49 48
50 // Builds the required filters for handling regular URLs and adds them to 49 // Builds the required filters for handling regular URLs and adds them to
51 // |filter_collection| and fills |video_decoder| returning true if successful. 50 // |filter_collection| and fills |video_decoder| returning true if successful.
52 void BuildDefaultCollection( 51 void BuildDefaultCollection(
53 const scoped_refptr<media::DataSource>& data_source, 52 const scoped_refptr<media::DataSource>& data_source,
54 media::MessageLoopFactory* message_loop_factory, 53 media::MessageLoopFactory* message_loop_factory,
55 media::FilterCollection* filter_collection, 54 media::FilterCollection* filter_collection,
56 media::Decryptor* decryptor, 55 media::Decryptor* decryptor);
57 scoped_refptr<media::FFmpegVideoDecoder>* video_decoder);
58 56
59 } // webkit_media 57 } // webkit_media
60 58
61 #endif // WEBKIT_MEDIA_FILTER_HELPERS_H_ 59 #endif // WEBKIT_MEDIA_FILTER_HELPERS_H_
OLDNEW
« no previous file with comments | « media/tools/player_x11/player_x11.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698