OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/logging.h" | 6 #include "base/logging.h" |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/string_split.h" | 9 #include "base/string_split.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 } | 210 } |
211 | 211 |
212 if (stream) | 212 if (stream) |
213 stream->Read(base::Bind(&AdaptiveDemuxerStream::OnReadDone, this)); | 213 stream->Read(base::Bind(&AdaptiveDemuxerStream::OnReadDone, this)); |
214 } | 214 } |
215 | 215 |
216 AVStream* AdaptiveDemuxerStream::GetAVStream() { | 216 AVStream* AdaptiveDemuxerStream::GetAVStream() { |
217 return current_stream()->GetAVStream(); | 217 return current_stream()->GetAVStream(); |
218 } | 218 } |
219 | 219 |
| 220 const AudioDecoderConfig& AdaptiveDemuxerStream::audio_decoder_config() { |
| 221 return current_stream()->audio_decoder_config(); |
| 222 } |
| 223 |
220 DemuxerStream::Type AdaptiveDemuxerStream::type() { | 224 DemuxerStream::Type AdaptiveDemuxerStream::type() { |
221 return current_stream()->type(); | 225 return current_stream()->type(); |
222 } | 226 } |
223 | 227 |
224 void AdaptiveDemuxerStream::EnableBitstreamConverter() { | 228 void AdaptiveDemuxerStream::EnableBitstreamConverter() { |
225 { | 229 { |
226 base::AutoLock auto_lock(lock_); | 230 base::AutoLock auto_lock(lock_); |
227 bitstream_converter_enabled_ = true; | 231 bitstream_converter_enabled_ = true; |
228 } | 232 } |
229 current_stream()->EnableBitstreamConverter(); | 233 current_stream()->EnableBitstreamConverter(); |
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1031 delete cb; | 1035 delete cb; |
1032 return; | 1036 return; |
1033 } | 1037 } |
1034 DemuxerAccumulator* accumulator = new DemuxerAccumulator( | 1038 DemuxerAccumulator* accumulator = new DemuxerAccumulator( |
1035 audio_index, video_index, urls.size(), cb); | 1039 audio_index, video_index, urls.size(), cb); |
1036 for (size_t i = 0; i < urls.size(); ++i) | 1040 for (size_t i = 0; i < urls.size(); ++i) |
1037 delegate_factory_->Build(urls[i], accumulator->GetNthCallback(i)); | 1041 delegate_factory_->Build(urls[i], accumulator->GetNthCallback(i)); |
1038 } | 1042 } |
1039 | 1043 |
1040 } // namespace media | 1044 } // namespace media |
OLD | NEW |