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

Side by Side Diff: media/base/mock_filters.cc

Issue 1904793002: Move Pipeline permanent callbacks into Pipeline::Client interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 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
OLDNEW
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/base/mock_filters.h" 5 #include "media/base/mock_filters.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "media/base/text_track_config.h"
9 10
10 using ::testing::_; 11 using ::testing::_;
11 using ::testing::Invoke; 12 using ::testing::Invoke;
12 using ::testing::NotNull; 13 using ::testing::NotNull;
13 using ::testing::Return; 14 using ::testing::Return;
14 15
15 namespace media { 16 namespace media {
16 17
18 MockPipelineClient::MockPipelineClient() {}
19 MockPipelineClient::~MockPipelineClient() {}
20
17 MockPipeline::MockPipeline() {} 21 MockPipeline::MockPipeline() {}
18
19 MockPipeline::~MockPipeline() {} 22 MockPipeline::~MockPipeline() {}
20 23
21 void MockPipeline::Start(Demuxer* demuxer, 24 void MockPipeline::Start(Demuxer* demuxer,
22 scoped_ptr<Renderer> renderer, 25 scoped_ptr<Renderer> renderer,
23 const base::Closure& ended_cb, 26 Client* client,
24 const PipelineStatusCB& error_cb, 27 const PipelineStatusCB& seek_cb) {
25 const PipelineStatusCB& seek_cb, 28 Start(demuxer, &renderer, client, seek_cb);
26 const PipelineMetadataCB& metadata_cb,
27 const BufferingStateCB& buffering_state_cb,
28 const base::Closure& duration_change_cb,
29 const AddTextTrackCB& add_text_track_cb,
30 const base::Closure& waiting_for_decryption_key_cb) {
31 Start(demuxer, &renderer, ended_cb, error_cb, seek_cb, metadata_cb,
32 buffering_state_cb, duration_change_cb, add_text_track_cb,
33 waiting_for_decryption_key_cb);
34 } 29 }
35 30
36 void MockPipeline::Resume(scoped_ptr<Renderer> renderer, 31 void MockPipeline::Resume(scoped_ptr<Renderer> renderer,
37 base::TimeDelta timestamp, 32 base::TimeDelta timestamp,
38 const PipelineStatusCB& seek_cb) { 33 const PipelineStatusCB& seek_cb) {
39 Resume(&renderer, timestamp, seek_cb); 34 Resume(&renderer, timestamp, seek_cb);
40 } 35 }
41 36
42 MockDemuxer::MockDemuxer() {} 37 MockDemuxer::MockDemuxer() {}
43 38
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 130
136 MockCdmContext::MockCdmContext() {} 131 MockCdmContext::MockCdmContext() {}
137 132
138 MockCdmContext::~MockCdmContext() {} 133 MockCdmContext::~MockCdmContext() {}
139 134
140 int MockCdmContext::GetCdmId() const { 135 int MockCdmContext::GetCdmId() const {
141 return CdmContext::kInvalidCdmId; 136 return CdmContext::kInvalidCdmId;
142 } 137 }
143 138
144 } // namespace media 139 } // namespace media
OLDNEW
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline.h » ('j') | media/base/pipeline.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698