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

Side by Side Diff: media/test/pipeline_integration_test_base.h

Issue 1735803002: Implemented passing media track info from ffmpeg into blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wolenetz@ CR feedback + better track info extraction in ffmpeg Created 4 years, 9 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/test/pipeline_integration_test.cc ('k') | media/test/pipeline_integration_test_base.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 #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 5 #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
6 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 6 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/md5.h" 10 #include "base/md5.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 void OnSeeked(base::TimeDelta seek_time, PipelineStatus status); 125 void OnSeeked(base::TimeDelta seek_time, PipelineStatus status);
126 void OnStatusCallback(PipelineStatus status); 126 void OnStatusCallback(PipelineStatus status);
127 void DemuxerEncryptedMediaInitDataCB(EmeInitDataType type, 127 void DemuxerEncryptedMediaInitDataCB(EmeInitDataType type,
128 const std::vector<uint8_t>& init_data); 128 const std::vector<uint8_t>& init_data);
129 void set_encrypted_media_init_data_cb( 129 void set_encrypted_media_init_data_cb(
130 const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) { 130 const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
131 encrypted_media_init_data_cb_ = encrypted_media_init_data_cb; 131 encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
132 } 132 }
133 133
134 void DemuxerMediaTracksUpdatedCB(scoped_ptr<MediaTracks> tracks);
135
134 void OnEnded(); 136 void OnEnded();
135 void OnError(PipelineStatus status); 137 void OnError(PipelineStatus status);
136 void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time); 138 void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time);
137 139
138 // Creates Demuxer and sets |demuxer_|. 140 // Creates Demuxer and sets |demuxer_|.
139 void CreateDemuxer(const std::string& filename); 141 void CreateDemuxer(const std::string& filename);
140 142
141 // Creates and returns a Renderer. 143 // Creates and returns a Renderer.
142 virtual scoped_ptr<Renderer> CreateRenderer(); 144 virtual scoped_ptr<Renderer> CreateRenderer();
143 145
144 void OnVideoFramePaint(const scoped_refptr<VideoFrame>& frame); 146 void OnVideoFramePaint(const scoped_refptr<VideoFrame>& frame);
145 147
146 MOCK_METHOD1(OnMetadata, void(PipelineMetadata)); 148 MOCK_METHOD1(OnMetadata, void(PipelineMetadata));
147 MOCK_METHOD1(OnBufferingStateChanged, void(BufferingState)); 149 MOCK_METHOD1(OnBufferingStateChanged, void(BufferingState));
148 MOCK_METHOD1(DecryptorAttached, void(bool)); 150 MOCK_METHOD1(DecryptorAttached, void(bool));
149 MOCK_METHOD2(OnAddTextTrack, 151 MOCK_METHOD2(OnAddTextTrack,
150 void(const TextTrackConfig& config, 152 void(const TextTrackConfig& config,
151 const AddTextTrackDoneCB& done_cb)); 153 const AddTextTrackDoneCB& done_cb));
152 MOCK_METHOD0(OnWaitingForDecryptionKey, void(void)); 154 MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
153 }; 155 };
154 156
155 } // namespace media 157 } // namespace media
156 158
157 #endif // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 159 #endif // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
OLDNEW
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698