OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "media/mojo/services/demuxer_stream_provider_shim.h" | 5 #include "media/mojo/services/media_resource_shim.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
11 #include "base/callback_helpers.h" | 11 #include "base/callback_helpers.h" |
12 | 12 |
13 namespace media { | 13 namespace media { |
14 | 14 |
15 DemuxerStreamProviderShim::DemuxerStreamProviderShim( | 15 MediaResourceShim::MediaResourceShim( |
16 std::vector<mojom::DemuxerStreamPtr> streams, | 16 std::vector<mojom::DemuxerStreamPtr> streams, |
17 const base::Closure& demuxer_ready_cb) | 17 const base::Closure& demuxer_ready_cb) |
18 : demuxer_ready_cb_(demuxer_ready_cb), | 18 : demuxer_ready_cb_(demuxer_ready_cb), |
19 streams_ready_(0), | 19 streams_ready_(0), |
20 weak_factory_(this) { | 20 weak_factory_(this) { |
21 DCHECK(!streams.empty()); | 21 DCHECK(!streams.empty()); |
22 DCHECK(!demuxer_ready_cb_.is_null()); | 22 DCHECK(!demuxer_ready_cb_.is_null()); |
23 | 23 |
24 for (auto& s : streams) { | 24 for (auto& s : streams) { |
25 streams_.emplace_back(new MojoDemuxerStreamAdapter( | 25 streams_.emplace_back(new MojoDemuxerStreamAdapter( |
26 std::move(s), base::Bind(&DemuxerStreamProviderShim::OnStreamReady, | 26 std::move(s), base::Bind(&MediaResourceShim::OnStreamReady, |
27 weak_factory_.GetWeakPtr()))); | 27 weak_factory_.GetWeakPtr()))); |
28 } | 28 } |
29 } | 29 } |
30 | 30 |
31 DemuxerStreamProviderShim::~DemuxerStreamProviderShim() { | 31 MediaResourceShim::~MediaResourceShim() {} |
32 | |
33 std::vector<DemuxerStream*> MediaResourceShim::GetStreams() { | |
34 DCHECK(demuxer_ready_cb_.is_null()); | |
35 std::vector<DemuxerStream*> result; | |
36 for (auto& stream : streams_) | |
37 result.push_back(stream.get()); | |
tguilbert
2017/01/24 23:24:41
Is there a difference between this code using the
servolk
2017/01/25 00:57:32
We can't use a copy constructor, since |streams_|
tguilbert
2017/01/25 02:36:46
Oops, you are right, I missed |streams_|'s type.
| |
38 return result; | |
32 } | 39 } |
33 | 40 |
34 DemuxerStream* DemuxerStreamProviderShim::GetStream(DemuxerStream::Type type) { | 41 void MediaResourceShim::OnStreamReady() { |
35 DCHECK(demuxer_ready_cb_.is_null()); | |
36 for (auto& stream : streams_) { | |
37 if (stream->type() == type) | |
38 return stream.get(); | |
39 } | |
40 | |
41 return nullptr; | |
42 } | |
43 | |
44 void DemuxerStreamProviderShim::OnStreamReady() { | |
45 if (++streams_ready_ == streams_.size()) | 42 if (++streams_ready_ == streams_.size()) |
46 base::ResetAndReturn(&demuxer_ready_cb_).Run(); | 43 base::ResetAndReturn(&demuxer_ready_cb_).Run(); |
47 } | 44 } |
48 | 45 |
49 } // namespace media | 46 } // namespace media |
OLD | NEW |