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

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

Issue 10829470: Support for parsing encrypted WebM streams by src. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing 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
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 #include "media/filters/ffmpeg_demuxer.h"
11 // TODO(fgalligan): Remove the dependency on FFmpeg.
ddorwin 2012/08/24 00:20:30 above line 10
fgalligan1 2012/08/24 20:01:26 Done.
10 12
11 namespace media { 13 namespace media {
12 class Decryptor; 14 class Decryptor;
13 class ChunkDemuxerClient; 15 class ChunkDemuxerClient;
14 class DataSource; 16 class DataSource;
15 class FFmpegVideoDecoder; 17 class FFmpegVideoDecoder;
16 class FilterCollection; 18 class FilterCollection;
17 class MessageLoopFactory; 19 class MessageLoopFactory;
18 } 20 }
19 21
(...skipping 25 matching lines...) Expand all
45 media::MessageLoopFactory* message_loop_factory, 47 media::MessageLoopFactory* message_loop_factory,
46 media::FilterCollection* filter_collection, 48 media::FilterCollection* filter_collection,
47 media::Decryptor* decryptor); 49 media::Decryptor* decryptor);
48 50
49 // Builds the required filters for handling regular URLs and adds them to 51 // Builds the required filters for handling regular URLs and adds them to
50 // |filter_collection| and fills |video_decoder| returning true if successful. 52 // |filter_collection| and fills |video_decoder| returning true if successful.
51 void BuildDefaultCollection( 53 void BuildDefaultCollection(
52 const scoped_refptr<media::DataSource>& data_source, 54 const scoped_refptr<media::DataSource>& data_source,
53 media::MessageLoopFactory* message_loop_factory, 55 media::MessageLoopFactory* message_loop_factory,
54 media::FilterCollection* filter_collection, 56 media::FilterCollection* filter_collection,
55 media::Decryptor* decryptor); 57 media::Decryptor* decryptor,
58 const media::FFmpegNeedKeyCB& need_key_cb);
56 59
57 } // webkit_media 60 } // webkit_media
58 61
59 #endif // WEBKIT_MEDIA_FILTER_HELPERS_H_ 62 #endif // WEBKIT_MEDIA_FILTER_HELPERS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698