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

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

Issue 10829470: Support for parsing encrypted WebM streams by src. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tool player_x11 Created 7 years, 9 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 | « webkit/media/filter_helpers.h ('k') | webkit/media/webmediaplayer_impl.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 #include "webkit/media/filter_helpers.h" 5 #include "webkit/media/filter_helpers.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "media/base/filter_collection.h" 9 #include "media/base/filter_collection.h"
10 #include "media/base/media_switches.h" 10 #include "media/base/media_switches.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 // TODO(acolwell): Remove this once http://crbug.com/151045 is fixed. 65 // TODO(acolwell): Remove this once http://crbug.com/151045 is fixed.
66 DCHECK_LE(filter_collection->GetVideoDecoders()->size(), 1u); 66 DCHECK_LE(filter_collection->GetVideoDecoders()->size(), 1u);
67 filter_collection->GetVideoDecoders()->clear(); 67 filter_collection->GetVideoDecoders()->clear();
68 68
69 AddDefaultDecodersToCollection(message_loop, filter_collection); 69 AddDefaultDecodersToCollection(message_loop, filter_collection);
70 } 70 }
71 71
72 void BuildDefaultCollection( 72 void BuildDefaultCollection(
73 const scoped_refptr<media::DataSource>& data_source, 73 const scoped_refptr<media::DataSource>& data_source,
74 const scoped_refptr<base::MessageLoopProxy>& message_loop, 74 const scoped_refptr<base::MessageLoopProxy>& message_loop,
75 media::FilterCollection* filter_collection) { 75 media::FilterCollection* filter_collection,
76 const media::FFmpegNeedKeyCB& need_key_cb) {
76 filter_collection->SetDemuxer(new media::FFmpegDemuxer( 77 filter_collection->SetDemuxer(new media::FFmpegDemuxer(
77 message_loop, data_source)); 78 message_loop, data_source, need_key_cb));
78 79
79 AddDefaultDecodersToCollection(message_loop, filter_collection); 80 AddDefaultDecodersToCollection(message_loop, filter_collection);
80 } 81 }
81 82
82 } // webkit_media 83 } // webkit_media
OLDNEW
« no previous file with comments | « webkit/media/filter_helpers.h ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698