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

Unified Diff: media/filters/ffmpeg_demuxer_factory.cc

Issue 9860027: Remove DemuxerFactory and URL parameter from Pipeline. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: added some todos Created 8 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 side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_demuxer_factory.cc
diff --git a/media/filters/ffmpeg_demuxer_factory.cc b/media/filters/ffmpeg_demuxer_factory.cc
deleted file mode 100644
index 13494b9bdbf9d1262c72e15bf31035201b96465a..0000000000000000000000000000000000000000
--- a/media/filters/ffmpeg_demuxer_factory.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 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 "base/bind.h"
-#include "base/message_loop.h"
-#include "googleurl/src/gurl.h"
-#include "media/filters/ffmpeg_demuxer.h"
-#include "media/filters/ffmpeg_demuxer_factory.h"
-
-namespace media {
-
-FFmpegDemuxerFactory::FFmpegDemuxerFactory(
- const scoped_refptr<DataSource>& data_source,
- MessageLoop* loop)
- : data_source_(data_source),
- loop_(loop) {
-}
-
-FFmpegDemuxerFactory::~FFmpegDemuxerFactory() {}
-
-static void DemuxerInitDone(const DemuxerFactory::BuildCallback& cb,
- const scoped_refptr<FFmpegDemuxer>& demuxer,
- PipelineStatus status) {
- cb.Run(status, demuxer);
-}
-
-void FFmpegDemuxerFactory::Build(const std::string& url,
- const BuildCallback& cb) {
- GURL gurl = GURL(url);
- bool local_source = !gurl.SchemeIs("http") && !gurl.SchemeIs("https");
- scoped_refptr<FFmpegDemuxer> demuxer = new FFmpegDemuxer(loop_, local_source);
-
- demuxer->Initialize(
- data_source_,
- base::Bind(&DemuxerInitDone, cb, demuxer));
-}
-
-} // namespace media

Powered by Google App Engine
This is Rietveld 408576698