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

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: 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 #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 "media/base/filter_collection.h" 8 #include "media/base/filter_collection.h"
9 #include "media/base/message_loop_factory.h" 9 #include "media/base/message_loop_factory.h"
10 #include "media/filters/chunk_demuxer.h" 10 #include "media/filters/chunk_demuxer.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 AddDefaultDecodersToCollection(message_loop_factory, filter_collection, 74 AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
75 decryptor); 75 decryptor);
76 return true; 76 return true;
77 } 77 }
78 78
79 void BuildDefaultCollection( 79 void BuildDefaultCollection(
80 const scoped_refptr<media::DataSource>& data_source, 80 const scoped_refptr<media::DataSource>& data_source,
81 media::MessageLoopFactory* message_loop_factory, 81 media::MessageLoopFactory* message_loop_factory,
82 media::FilterCollection* filter_collection, 82 media::FilterCollection* filter_collection,
83 media::Decryptor* decryptor) { 83 media::Decryptor* decryptor,
84 const media::FFmpegNeedKeyCB& need_key_cb) {
84 filter_collection->SetDemuxer(new media::FFmpegDemuxer( 85 filter_collection->SetDemuxer(new media::FFmpegDemuxer(
85 message_loop_factory->GetMessageLoop( 86 message_loop_factory->GetMessageLoop(
86 media::MessageLoopFactory::kPipeline), 87 media::MessageLoopFactory::kPipeline),
87 data_source)); 88 data_source,
89 need_key_cb));
88 90
89 AddDefaultDecodersToCollection(message_loop_factory, filter_collection, 91 AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
90 decryptor); 92 decryptor);
91 } 93 }
92 94
93 } // webkit_media 95 } // webkit_media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698