| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/filters/chunk_demuxer.h" | 5 #include "media/filters/chunk_demuxer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <list> | 9 #include <list> |
| 10 #include <utility> |
| 10 | 11 |
| 11 #include "base/bind.h" | 12 #include "base/bind.h" |
| 12 #include "base/callback_helpers.h" | 13 #include "base/callback_helpers.h" |
| 13 #include "base/location.h" | 14 #include "base/location.h" |
| 14 #include "base/macros.h" | 15 #include "base/macros.h" |
| 15 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
| 16 #include "media/base/audio_decoder_config.h" | 17 #include "media/base/audio_decoder_config.h" |
| 17 #include "media/base/bind_to_current_loop.h" | 18 #include "media/base/bind_to_current_loop.h" |
| 18 #include "media/base/stream_parser_buffer.h" | 19 #include "media/base/stream_parser_buffer.h" |
| 19 #include "media/base/timestamp_constants.h" | 20 #include "media/base/timestamp_constants.h" |
| (...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1379 | 1380 |
| 1380 if (has_video) | 1381 if (has_video) |
| 1381 source_id_video_ = id; | 1382 source_id_video_ = id; |
| 1382 | 1383 |
| 1383 scoped_ptr<FrameProcessor> frame_processor( | 1384 scoped_ptr<FrameProcessor> frame_processor( |
| 1384 new FrameProcessor(base::Bind(&ChunkDemuxer::IncreaseDurationIfNecessary, | 1385 new FrameProcessor(base::Bind(&ChunkDemuxer::IncreaseDurationIfNecessary, |
| 1385 base::Unretained(this)), | 1386 base::Unretained(this)), |
| 1386 media_log_)); | 1387 media_log_)); |
| 1387 | 1388 |
| 1388 scoped_ptr<SourceState> source_state(new SourceState( | 1389 scoped_ptr<SourceState> source_state(new SourceState( |
| 1389 stream_parser.Pass(), frame_processor.Pass(), | 1390 std::move(stream_parser), std::move(frame_processor), |
| 1390 base::Bind(&ChunkDemuxer::CreateDemuxerStream, base::Unretained(this)), | 1391 base::Bind(&ChunkDemuxer::CreateDemuxerStream, base::Unretained(this)), |
| 1391 media_log_)); | 1392 media_log_)); |
| 1392 | 1393 |
| 1393 SourceState::NewTextTrackCB new_text_track_cb; | 1394 SourceState::NewTextTrackCB new_text_track_cb; |
| 1394 | 1395 |
| 1395 if (enable_text_) { | 1396 if (enable_text_) { |
| 1396 new_text_track_cb = base::Bind(&ChunkDemuxer::OnNewTextTrack, | 1397 new_text_track_cb = base::Bind(&ChunkDemuxer::OnNewTextTrack, |
| 1397 base::Unretained(this)); | 1398 base::Unretained(this)); |
| 1398 } | 1399 } |
| 1399 | 1400 |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1966 } | 1967 } |
| 1967 | 1968 |
| 1968 void ChunkDemuxer::ShutdownAllStreams() { | 1969 void ChunkDemuxer::ShutdownAllStreams() { |
| 1969 for (SourceStateMap::iterator itr = source_state_map_.begin(); | 1970 for (SourceStateMap::iterator itr = source_state_map_.begin(); |
| 1970 itr != source_state_map_.end(); ++itr) { | 1971 itr != source_state_map_.end(); ++itr) { |
| 1971 itr->second->Shutdown(); | 1972 itr->second->Shutdown(); |
| 1972 } | 1973 } |
| 1973 } | 1974 } |
| 1974 | 1975 |
| 1975 } // namespace media | 1976 } // namespace media |
| OLD | NEW |