OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/fake_demuxer_stream.h" | 5 #include "media/filters/fake_demuxer_stream.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "media/base/bind_to_loop.h" | 12 #include "media/base/bind_to_loop.h" |
13 #include "media/base/decoder_buffer.h" | 13 #include "media/base/decoder_buffer.h" |
14 #include "media/base/test_helpers.h" | 14 #include "media/base/test_helpers.h" |
15 #include "media/base/text_track.h" | |
acolwell GONE FROM CHROMIUM
2013/10/24 18:57:51
nit: Remove since it doesn't appear to be needed.
Matthew Heaney (Chromium)
2013/10/25 03:05:38
Done.
| |
15 #include "media/base/video_frame.h" | 16 #include "media/base/video_frame.h" |
16 #include "ui/gfx/rect.h" | 17 #include "ui/gfx/rect.h" |
17 #include "ui/gfx/size.h" | 18 #include "ui/gfx/size.h" |
18 | 19 |
19 namespace media { | 20 namespace media { |
20 | 21 |
21 static const int kStartTimestampMs = 0; | 22 static const int kStartTimestampMs = 0; |
22 static const int kDurationMs = 30; | 23 static const int kDurationMs = 30; |
23 static const int kStartWidth = 320; | 24 static const int kStartWidth = 320; |
24 static const int kStartHeight = 240; | 25 static const int kStartHeight = 240; |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
148 | 149 |
149 num_buffers_left_in_current_config_--; | 150 num_buffers_left_in_current_config_--; |
150 if (num_buffers_left_in_current_config_ == 0) | 151 if (num_buffers_left_in_current_config_ == 0) |
151 num_configs_left_--; | 152 num_configs_left_--; |
152 | 153 |
153 num_buffers_returned_++; | 154 num_buffers_returned_++; |
154 base::ResetAndReturn(&read_cb_).Run(kOk, buffer); | 155 base::ResetAndReturn(&read_cb_).Run(kOk, buffer); |
155 } | 156 } |
156 | 157 |
157 } // namespace media | 158 } // namespace media |
OLD | NEW |