| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/media/framework/parts/demux.h" | 5 #include "services/media/framework/parts/demux.h" |
| 6 #include "services/media/framework_ffmpeg/ffmpeg_demux.h" | 6 #include "services/media/framework_ffmpeg/ffmpeg_demux.h" |
| 7 | 7 |
| 8 namespace mojo { | 8 namespace mojo { |
| 9 namespace media { | 9 namespace media { |
| 10 | 10 |
| 11 Result Demux::Create( | 11 Result Demux::Create(std::shared_ptr<Reader> reader, |
| 12 std::shared_ptr<Reader> reader, | 12 std::shared_ptr<Demux>* demux_out) { |
| 13 std::shared_ptr<Demux>* demux_out) { | |
| 14 std::shared_ptr<Demux> demux = FfmpegDemux::Create(); | 13 std::shared_ptr<Demux> demux = FfmpegDemux::Create(); |
| 15 | 14 |
| 16 Result result = demux->Init(reader); | 15 Result result = demux->Init(reader); |
| 17 if (result == Result::kOk) { | 16 if (result == Result::kOk) { |
| 18 *demux_out = demux; | 17 *demux_out = demux; |
| 19 } | 18 } |
| 20 | 19 |
| 21 return result; | 20 return result; |
| 22 } | 21 } |
| 23 | 22 |
| 24 } // namespace media | 23 } // namespace media |
| 25 } // namespace mojo | 24 } // namespace mojo |
| OLD | NEW |