| 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <deque> | 6 #include <deque> |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 FFmpegDemuxerTest() {} | 72 FFmpegDemuxerTest() {} |
| 73 | 73 |
| 74 virtual ~FFmpegDemuxerTest() { | 74 virtual ~FFmpegDemuxerTest() { |
| 75 if (demuxer_) | 75 if (demuxer_) |
| 76 demuxer_->Stop(); | 76 demuxer_->Stop(); |
| 77 } | 77 } |
| 78 | 78 |
| 79 void CreateDemuxer(const std::string& name) { | 79 void CreateDemuxer(const std::string& name) { |
| 80 CHECK(!demuxer_); | 80 CHECK(!demuxer_); |
| 81 | 81 |
| 82 EXPECT_CALL(host_, AddBufferedTimeRange(_, _)).Times(AnyNumber()); | 82 EXPECT_CALL(host_, OnBufferedTimeRangesChanged(_)).Times(AnyNumber()); |
| 83 | 83 |
| 84 CreateDataSource(name); | 84 CreateDataSource(name); |
| 85 | 85 |
| 86 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = base::Bind( | 86 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = base::Bind( |
| 87 &FFmpegDemuxerTest::OnEncryptedMediaInitData, base::Unretained(this)); | 87 &FFmpegDemuxerTest::OnEncryptedMediaInitData, base::Unretained(this)); |
| 88 | 88 |
| 89 demuxer_.reset(new FFmpegDemuxer( | 89 demuxer_.reset(new FFmpegDemuxer( |
| 90 message_loop_.task_runner(), data_source_.get(), | 90 message_loop_.task_runner(), data_source_.get(), |
| 91 encrypted_media_init_data_cb, new MediaLog())); | 91 encrypted_media_init_data_cb, new MediaLog())); |
| 92 } | 92 } |
| (...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1123 | 1123 |
| 1124 video->Read(NewReadCB(FROM_HERE, 3569, 66733, true)); | 1124 video->Read(NewReadCB(FROM_HERE, 3569, 66733, true)); |
| 1125 message_loop_.Run(); | 1125 message_loop_.Run(); |
| 1126 | 1126 |
| 1127 video->Read(NewReadCB(FROM_HERE, 1042, 200200, false)); | 1127 video->Read(NewReadCB(FROM_HERE, 1042, 200200, false)); |
| 1128 message_loop_.Run(); | 1128 message_loop_.Run(); |
| 1129 } | 1129 } |
| 1130 #endif | 1130 #endif |
| 1131 | 1131 |
| 1132 } // namespace media | 1132 } // namespace media |
| OLD | NEW |