| Index: media/filters/ffmpeg_demuxer_factory.cc
 | 
| diff --git a/media/filters/ffmpeg_demuxer_factory.cc b/media/filters/ffmpeg_demuxer_factory.cc
 | 
| new file mode 100644
 | 
| index 0000000000000000000000000000000000000000..add2c54e689ffadbab29356ad527391b23fa8677
 | 
| --- /dev/null
 | 
| +++ b/media/filters/ffmpeg_demuxer_factory.cc
 | 
| @@ -0,0 +1,87 @@
 | 
| +// Copyright (c) 2011 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/message_loop.h"
 | 
| +#include "media/filters/ffmpeg_demuxer.h"
 | 
| +#include "media/filters/ffmpeg_demuxer_factory.h"
 | 
| +
 | 
| +namespace media {
 | 
| +
 | 
| +FFmpegDemuxerFactory::FFmpegDemuxerFactory(
 | 
| +    DataSourceFactory* data_source_factory,
 | 
| +    MessageLoop* loop)
 | 
| +    : data_source_factory_(data_source_factory), loop_(loop) {}
 | 
| +
 | 
| +FFmpegDemuxerFactory::~FFmpegDemuxerFactory() {}
 | 
| +
 | 
| +// This and the next class are one-offs whose raison d'etre is the lack of
 | 
| +// currying functionality in base/callback_old.h's machinery.  Once media/
 | 
| +// PipelineStatusCallback and {DataSource,Demuxer}Factory::BuildCallback are
 | 
| +// migrated to the new base/callback.h machinery these should be removed and
 | 
| +// replaced with currying calls to base::Bind().
 | 
| +class DemuxerCallbackAsPipelineStatusCallback : public PipelineStatusCallback {
 | 
| + public:
 | 
| +  DemuxerCallbackAsPipelineStatusCallback(
 | 
| +      DemuxerFactory::BuildCallback* cb,
 | 
| +      Demuxer* demuxer)
 | 
| +      : cb_(cb), demuxer_(demuxer) {
 | 
| +    DCHECK(cb_.get() && demuxer_);
 | 
| +  }
 | 
| +
 | 
| +  virtual ~DemuxerCallbackAsPipelineStatusCallback() {}
 | 
| +
 | 
| +  virtual void RunWithParams(const Tuple1<PipelineError>& params) {
 | 
| +    cb_->Run(params.a, demuxer_);
 | 
| +  }
 | 
| +
 | 
| + private:
 | 
| +  scoped_ptr<DemuxerFactory::BuildCallback> cb_;
 | 
| +  scoped_refptr<Demuxer> demuxer_;
 | 
| +
 | 
| +  DISALLOW_IMPLICIT_CONSTRUCTORS(DemuxerCallbackAsPipelineStatusCallback);
 | 
| +};
 | 
| +
 | 
| +// See comments on DemuxerCallbackAsPipelineStatusCallback above.
 | 
| +class DemuxerCallbackAsDataSourceCallback :
 | 
| +    public DataSourceFactory::BuildCallback {
 | 
| + public:
 | 
| +  DemuxerCallbackAsDataSourceCallback(DemuxerFactory::BuildCallback* cb,
 | 
| +                                      MessageLoop* loop)
 | 
| +      : cb_(cb), loop_(loop) {
 | 
| +    DCHECK(cb_.get() && loop_);
 | 
| +  }
 | 
| +
 | 
| +  virtual ~DemuxerCallbackAsDataSourceCallback() {}
 | 
| +
 | 
| +  virtual void RunWithParams(const Tuple2<PipelineError, DataSource*>& params) {
 | 
| +    PipelineError status = params.a;
 | 
| +    DataSource* data_source = params.b;
 | 
| +    if (status != PIPELINE_OK) {
 | 
| +      cb_->Run(status, static_cast<Demuxer*>(NULL));
 | 
| +      return;
 | 
| +    }
 | 
| +    DCHECK(data_source);
 | 
| +    scoped_refptr<FFmpegDemuxer> demuxer = new FFmpegDemuxer(loop_);
 | 
| +    demuxer->Initialize(
 | 
| +        data_source,
 | 
| +        new DemuxerCallbackAsPipelineStatusCallback(cb_.release(), demuxer));
 | 
| +  }
 | 
| +
 | 
| + private:
 | 
| +  scoped_ptr<DemuxerFactory::BuildCallback> cb_;
 | 
| +  MessageLoop* loop_;
 | 
| +
 | 
| +  DISALLOW_IMPLICIT_CONSTRUCTORS(DemuxerCallbackAsDataSourceCallback);
 | 
| +};
 | 
| +
 | 
| +void FFmpegDemuxerFactory::Build(const std::string& url, BuildCallback* cb) {
 | 
| +  data_source_factory_->Build(
 | 
| +      url, new DemuxerCallbackAsDataSourceCallback(cb, loop_));
 | 
| +}
 | 
| +
 | 
| +DemuxerFactory* FFmpegDemuxerFactory::Clone() const {
 | 
| +  return new FFmpegDemuxerFactory(data_source_factory_->Clone(), loop_);
 | 
| +}
 | 
| +
 | 
| +}  // namespace media
 | 
| 
 |