| Index: media/filters/pipeline_integration_test_base.h
|
| diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h
|
| index ade9ad6d97482b798c35d07bff9099f2a0144f9e..f095fba7c372aa316bf42f2e468bc4b3bacbbb9b 100644
|
| --- a/media/filters/pipeline_integration_test_base.h
|
| +++ b/media/filters/pipeline_integration_test_base.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef MEDIA_FILTERS_PIPELINE_INTEGRATION_TEST_BASE_H_
|
| #define MEDIA_FILTERS_PIPELINE_INTEGRATION_TEST_BASE_H_
|
|
|
| +#include <set>
|
| +
|
| #include "base/md5.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "media/audio/clockless_audio_sink.h"
|
| @@ -12,6 +14,7 @@
|
| #include "media/base/filter_collection.h"
|
| #include "media/base/media_keys.h"
|
| #include "media/base/pipeline.h"
|
| +#include "media/base/text_track.h"
|
| #include "media/base/video_frame.h"
|
| #include "media/filters/video_renderer_base.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -24,6 +27,7 @@ namespace media {
|
|
|
| class Decryptor;
|
| class Demuxer;
|
| +class TextBuffer;
|
|
|
| // Empty MD5 hash string. Used to verify empty video tracks.
|
| extern const char kNullVideoHash[];
|
| @@ -98,6 +102,9 @@ class PipelineIntegrationTestBase {
|
| NeedKeyCB need_key_cb_;
|
| VideoFrame::Format last_video_frame_format_;
|
|
|
| + typedef std::set<int> TextTracks;
|
| + TextTracks ffmpeg_text_tracks_;
|
| +
|
| void OnStatusCallbackChecked(PipelineStatus expected_status,
|
| PipelineStatus status);
|
| void OnStatusCallback(PipelineStatus status);
|
| @@ -107,6 +114,10 @@ class PipelineIntegrationTestBase {
|
| void set_need_key_cb(const NeedKeyCB& need_key_cb) {
|
| need_key_cb_ = need_key_cb;
|
| }
|
| + void OnFFmpegTextTrackCB(media::TextKind kind,
|
| + const std::string& label,
|
| + const std::string& language,
|
| + int index);
|
|
|
| void OnEnded();
|
| void OnError(PipelineStatus status);
|
| @@ -117,6 +128,8 @@ class PipelineIntegrationTestBase {
|
| void SetDecryptor(Decryptor* decryptor,
|
| const DecryptorReadyCB& decryptor_ready_cb);
|
| void OnVideoRendererPaint(const scoped_refptr<VideoFrame>& frame);
|
| + void OnCueReady(int index,
|
| + const scoped_refptr<media::TextBuffer>& text_buffer);
|
|
|
| MOCK_METHOD1(OnSetOpaque, void(bool));
|
| MOCK_METHOD1(OnBufferingState, void(Pipeline::BufferingState));
|
|
|