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

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

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mojo Created 6 years, 1 month 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/fake_demuxer_stream.h ('k') | media/filters/ffmpeg_demuxer.h » ('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/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"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 NOTREACHED(); 77 NOTREACHED();
78 return AudioDecoderConfig(); 78 return AudioDecoderConfig();
79 } 79 }
80 80
81 VideoDecoderConfig FakeDemuxerStream::video_decoder_config() { 81 VideoDecoderConfig FakeDemuxerStream::video_decoder_config() {
82 DCHECK(task_runner_->BelongsToCurrentThread()); 82 DCHECK(task_runner_->BelongsToCurrentThread());
83 return video_decoder_config_; 83 return video_decoder_config_;
84 } 84 }
85 85
86 // TODO(xhwang): Support audio if needed. 86 // TODO(xhwang): Support audio if needed.
87 DemuxerStream::Type FakeDemuxerStream::type() { 87 DemuxerStream::Type FakeDemuxerStream::type() const {
88 DCHECK(task_runner_->BelongsToCurrentThread()); 88 DCHECK(task_runner_->BelongsToCurrentThread());
89 return VIDEO; 89 return VIDEO;
90 } 90 }
91 91
92 bool FakeDemuxerStream::SupportsConfigChanges() { 92 bool FakeDemuxerStream::SupportsConfigChanges() {
93 return config_changes_; 93 return config_changes_;
94 } 94 }
95 95
96 VideoRotation FakeDemuxerStream::video_rotation() { 96 VideoRotation FakeDemuxerStream::video_rotation() {
97 return VIDEO_ROTATION_0; 97 return VIDEO_ROTATION_0;
(...skipping 88 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/fake_demuxer_stream.h ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698