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

Side by Side Diff: media/base/mock_filters.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/base/mock_filters.h ('k') | media/base/pipeline_unittest.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) 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 9
10 using ::testing::_; 10 using ::testing::_;
11 using ::testing::Invoke; 11 using ::testing::Invoke;
12 using ::testing::NotNull; 12 using ::testing::NotNull;
13 using ::testing::Return; 13 using ::testing::Return;
14 14
15 namespace media { 15 namespace media {
16 16
17 MockDemuxer::MockDemuxer() {} 17 MockDemuxer::MockDemuxer() {}
18 18
19 MockDemuxer::~MockDemuxer() {} 19 MockDemuxer::~MockDemuxer() {}
20 20
21 MockDemuxerStream::MockDemuxerStream(DemuxerStream::Type type) : type_(type) {} 21 MockDemuxerStream::MockDemuxerStream(DemuxerStream::Type type)
22 : type_(type), liveness_(LIVENESS_UNKNOWN) {
23 }
22 24
23 MockDemuxerStream::~MockDemuxerStream() {} 25 MockDemuxerStream::~MockDemuxerStream() {}
24 26
25 DemuxerStream::Type MockDemuxerStream::type() { 27 DemuxerStream::Type MockDemuxerStream::type() const {
26 return type_; 28 return type_;
27 } 29 }
28 30
31 DemuxerStream::Liveness MockDemuxerStream::liveness() const {
32 return liveness_;
33 }
34
29 AudioDecoderConfig MockDemuxerStream::audio_decoder_config() { 35 AudioDecoderConfig MockDemuxerStream::audio_decoder_config() {
30 DCHECK_EQ(type_, DemuxerStream::AUDIO); 36 DCHECK_EQ(type_, DemuxerStream::AUDIO);
31 return audio_decoder_config_; 37 return audio_decoder_config_;
32 } 38 }
33 39
34 VideoDecoderConfig MockDemuxerStream::video_decoder_config() { 40 VideoDecoderConfig MockDemuxerStream::video_decoder_config() {
35 DCHECK_EQ(type_, DemuxerStream::VIDEO); 41 DCHECK_EQ(type_, DemuxerStream::VIDEO);
36 return video_decoder_config_; 42 return video_decoder_config_;
37 } 43 }
38 44
39 void MockDemuxerStream::set_audio_decoder_config( 45 void MockDemuxerStream::set_audio_decoder_config(
40 const AudioDecoderConfig& config) { 46 const AudioDecoderConfig& config) {
41 DCHECK_EQ(type_, DemuxerStream::AUDIO); 47 DCHECK_EQ(type_, DemuxerStream::AUDIO);
42 audio_decoder_config_ = config; 48 audio_decoder_config_ = config;
43 } 49 }
44 50
45 void MockDemuxerStream::set_video_decoder_config( 51 void MockDemuxerStream::set_video_decoder_config(
46 const VideoDecoderConfig& config) { 52 const VideoDecoderConfig& config) {
47 DCHECK_EQ(type_, DemuxerStream::VIDEO); 53 DCHECK_EQ(type_, DemuxerStream::VIDEO);
48 video_decoder_config_ = config; 54 video_decoder_config_ = config;
49 } 55 }
50 56
57 void MockDemuxerStream::set_liveness(DemuxerStream::Liveness liveness) {
58 liveness_ = liveness;
59 }
60
51 VideoRotation MockDemuxerStream::video_rotation() { 61 VideoRotation MockDemuxerStream::video_rotation() {
52 return VIDEO_ROTATION_0; 62 return VIDEO_ROTATION_0;
53 } 63 }
54 64
55 std::string MockVideoDecoder::GetDisplayName() const { 65 std::string MockVideoDecoder::GetDisplayName() const {
56 return "MockVideoDecoder"; 66 return "MockVideoDecoder";
57 } 67 }
58 68
59 MockVideoDecoder::MockVideoDecoder() { 69 MockVideoDecoder::MockVideoDecoder() {
60 EXPECT_CALL(*this, HasAlpha()).WillRepeatedly(Return(false)); 70 EXPECT_CALL(*this, HasAlpha()).WillRepeatedly(Return(false));
(...skipping 27 matching lines...) Expand all
88 98
89 MockTextTrack::MockTextTrack() {} 99 MockTextTrack::MockTextTrack() {}
90 100
91 MockTextTrack::~MockTextTrack() {} 101 MockTextTrack::~MockTextTrack() {}
92 102
93 MockDecryptor::MockDecryptor() {} 103 MockDecryptor::MockDecryptor() {}
94 104
95 MockDecryptor::~MockDecryptor() {} 105 MockDecryptor::~MockDecryptor() {}
96 106
97 } // namespace media 107 } // namespace media
OLDNEW
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698