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

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

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: incorporate aaron's comments (10/16) Created 7 years, 2 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 9
10 using ::testing::_; 10 using ::testing::_;
(...skipping 18 matching lines...) Expand all
29 AudioDecoderConfig MockDemuxerStream::audio_decoder_config() { 29 AudioDecoderConfig MockDemuxerStream::audio_decoder_config() {
30 DCHECK_EQ(type_, DemuxerStream::AUDIO); 30 DCHECK_EQ(type_, DemuxerStream::AUDIO);
31 return audio_decoder_config_; 31 return audio_decoder_config_;
32 } 32 }
33 33
34 VideoDecoderConfig MockDemuxerStream::video_decoder_config() { 34 VideoDecoderConfig MockDemuxerStream::video_decoder_config() {
35 DCHECK_EQ(type_, DemuxerStream::VIDEO); 35 DCHECK_EQ(type_, DemuxerStream::VIDEO);
36 return video_decoder_config_; 36 return video_decoder_config_;
37 } 37 }
38 38
39 TextTrackConfig MockDemuxerStream::text_track_config() {
40 DCHECK_EQ(type_, DemuxerStream::TEXT);
41 return text_track_config_;
42 }
43
39 void MockDemuxerStream::set_audio_decoder_config( 44 void MockDemuxerStream::set_audio_decoder_config(
40 const AudioDecoderConfig& config) { 45 const AudioDecoderConfig& config) {
41 DCHECK_EQ(type_, DemuxerStream::AUDIO); 46 DCHECK_EQ(type_, DemuxerStream::AUDIO);
42 audio_decoder_config_ = config; 47 audio_decoder_config_ = config;
43 } 48 }
44 49
45 void MockDemuxerStream::set_video_decoder_config( 50 void MockDemuxerStream::set_video_decoder_config(
46 const VideoDecoderConfig& config) { 51 const VideoDecoderConfig& config) {
47 DCHECK_EQ(type_, DemuxerStream::VIDEO); 52 DCHECK_EQ(type_, DemuxerStream::VIDEO);
48 video_decoder_config_ = config; 53 video_decoder_config_ = config;
(...skipping 19 matching lines...) Expand all
68 73
69 MockDecryptor::MockDecryptor() {} 74 MockDecryptor::MockDecryptor() {}
70 75
71 MockDecryptor::~MockDecryptor() {} 76 MockDecryptor::~MockDecryptor() {}
72 77
73 MockStatisticsCB::MockStatisticsCB() {} 78 MockStatisticsCB::MockStatisticsCB() {}
74 79
75 MockStatisticsCB::~MockStatisticsCB() {} 80 MockStatisticsCB::~MockStatisticsCB() {}
76 81
77 } // namespace media 82 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698