Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: media/filters/fake_demuxer_stream.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/filters/decrypting_video_decoder.cc ('k') | media/filters/fake_video_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/bind_to_current_loop.h"
8 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
9 #include "base/location.h" 10 #include "base/location.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/message_loop/message_loop_proxy.h" 12 #include "base/message_loop/message_loop_proxy.h"
12 #include "media/base/bind_to_current_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/video_frame.h" 15 #include "media/base/video_frame.h"
16 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
17 #include "ui/gfx/geometry/size.h" 17 #include "ui/gfx/geometry/size.h"
18 18
19 namespace media { 19 namespace media {
20 20
21 const int kStartTimestampMs = 0; 21 const int kStartTimestampMs = 0;
22 const int kDurationMs = 30; 22 const int kDurationMs = 30;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 duration_ = base::TimeDelta::FromMilliseconds(kDurationMs); 56 duration_ = base::TimeDelta::FromMilliseconds(kDurationMs);
57 splice_timestamp_ = kNoTimestamp(); 57 splice_timestamp_ = kNoTimestamp();
58 next_coded_size_ = gfx::Size(kStartWidth, kStartHeight); 58 next_coded_size_ = gfx::Size(kStartWidth, kStartHeight);
59 next_read_num_ = 0; 59 next_read_num_ = 0;
60 } 60 }
61 61
62 void FakeDemuxerStream::Read(const ReadCB& read_cb) { 62 void FakeDemuxerStream::Read(const ReadCB& read_cb) {
63 DCHECK(task_runner_->BelongsToCurrentThread()); 63 DCHECK(task_runner_->BelongsToCurrentThread());
64 DCHECK(read_cb_.is_null()); 64 DCHECK(read_cb_.is_null());
65 65
66 read_cb_ = BindToCurrentLoop(read_cb); 66 read_cb_ = base::BindToCurrentLoop(read_cb);
67 67
68 if (read_to_hold_ == next_read_num_) 68 if (read_to_hold_ == next_read_num_)
69 return; 69 return;
70 70
71 DCHECK(read_to_hold_ == -1 || read_to_hold_ > next_read_num_); 71 DCHECK(read_to_hold_ == -1 || read_to_hold_ > next_read_num_);
72 DoRead(); 72 DoRead();
73 } 73 }
74 74
75 AudioDecoderConfig FakeDemuxerStream::audio_decoder_config() { 75 AudioDecoderConfig FakeDemuxerStream::audio_decoder_config() {
76 DCHECK(task_runner_->BelongsToCurrentThread()); 76 DCHECK(task_runner_->BelongsToCurrentThread());
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 num_buffers_left_in_current_config_--; 187 num_buffers_left_in_current_config_--;
188 if (num_buffers_left_in_current_config_ == 0) 188 if (num_buffers_left_in_current_config_ == 0)
189 num_configs_left_--; 189 num_configs_left_--;
190 190
191 num_buffers_returned_++; 191 num_buffers_returned_++;
192 base::ResetAndReturn(&read_cb_).Run(kOk, buffer); 192 base::ResetAndReturn(&read_cb_).Run(kOk, buffer);
193 } 193 }
194 194
195 } // namespace media 195 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decrypting_video_decoder.cc ('k') | media/filters/fake_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698