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

Unified Diff: media/filters/default_demuxer_factory.cc

Issue 2643743002: Mojify demuxers and allow running {Chunk/FFmpeg}Demuxer in a Utility Process (Closed)
Patch Set: Rebase and make sure to unbind mojom::DemuxerPtr on the bound thread during termination Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/default_demuxer_factory.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/default_demuxer_factory.cc
diff --git a/media/filters/default_demuxer_factory.cc b/media/filters/default_demuxer_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..422dfcbcda9ffbde6291bb678aefaad91d64e0a6
--- /dev/null
+++ b/media/filters/default_demuxer_factory.cc
@@ -0,0 +1,55 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/filters/default_demuxer_factory.h"
+
+#include "base/single_thread_task_runner.h"
+#include "media/base/media_log.h"
+#include "media/filters/chunk_demuxer.h"
+
+#if !defined(MEDIA_DISABLE_FFMPEG)
+#include "media/filters/ffmpeg_demuxer.h"
+#endif
+
+namespace media {
+
+DefaultDemuxerFactory::DefaultDemuxerFactory(
+ const scoped_refptr<MediaLog>& media_log)
+ : media_log_(media_log) {}
+
+DefaultDemuxerFactory::~DefaultDemuxerFactory() {}
+
+std::unique_ptr<Demuxer> DefaultDemuxerFactory::CreateDemuxer(
+ const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
+ const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
+ DataSource* data_source,
+ const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
+ const Demuxer::MediaTracksUpdatedCB& media_tracks_updated_cb) {
+#if !defined(MEDIA_DISABLE_FFMPEG)
+ std::unique_ptr<Demuxer> demuxer(new FFmpegDemuxer(
+ media_task_runner, data_source, encrypted_media_init_data_cb,
+ media_tracks_updated_cb, media_log_));
+#endif
+
+ return demuxer;
+}
+
+std::unique_ptr<Demuxer> DefaultDemuxerFactory::CreateDemuxerSourceBuffer(
+ const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
+ const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
+ const base::Closure& open_cb,
+ const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
+ media::SourceBuffer** source_buffer_out) {
+ DCHECK(source_buffer_out);
+
+ media::ChunkDemuxer* chunk_demuxer = new media::ChunkDemuxer(
+ open_cb, encrypted_media_init_data_cb, media_log_);
+ *source_buffer_out = chunk_demuxer;
+
+ std::unique_ptr<Demuxer> demuxer(chunk_demuxer);
+
+ return demuxer;
+}
+
+} // namespace media
« no previous file with comments | « media/filters/default_demuxer_factory.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698