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

Side by Side Diff: media/formats/webm/webm_stream_parser_unittest.cc

Issue 1999893004: Splits PipelineImpl into main and media thread components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restores posting stop done_cb Created 4 years, 6 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/filters/media_source_state.h ('k') | media/test/pipeline_integration_test.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/formats/webm/webm_stream_parser.h" 5 #include "media/formats/webm/webm_stream_parser.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "media/base/decoder_buffer.h" 10 #include "media/base/decoder_buffer.h"
11 #include "media/base/demuxer.h"
11 #include "media/base/media_tracks.h" 12 #include "media/base/media_tracks.h"
12 #include "media/base/mock_media_log.h" 13 #include "media/base/mock_media_log.h"
13 #include "media/base/stream_parser.h" 14 #include "media/base/stream_parser.h"
14 #include "media/base/test_data_util.h" 15 #include "media/base/test_data_util.h"
15 #include "media/base/text_track_config.h" 16 #include "media/base/text_track_config.h"
16 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
17 18
18 using testing::SaveArg; 19 using testing::SaveArg;
19 using testing::_; 20 using testing::_;
20 21
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 params.detected_audio_track_count = 1; 150 params.detected_audio_track_count = 1;
150 params.detected_video_track_count = 1; 151 params.detected_video_track_count = 1;
151 params.detected_text_track_count = 1; 152 params.detected_text_track_count = 1;
152 ParseWebMFile("bear-vp8-webvtt.webm", params); 153 ParseWebMFile("bear-vp8-webvtt.webm", params);
153 EXPECT_EQ(media_tracks_->tracks().size(), 2u); 154 EXPECT_EQ(media_tracks_->tracks().size(), 2u);
154 EXPECT_EQ(media_tracks_->tracks()[0]->type(), MediaTrack::Video); 155 EXPECT_EQ(media_tracks_->tracks()[0]->type(), MediaTrack::Video);
155 EXPECT_EQ(media_tracks_->tracks()[1]->type(), MediaTrack::Audio); 156 EXPECT_EQ(media_tracks_->tracks()[1]->type(), MediaTrack::Audio);
156 } 157 }
157 158
158 } // namespace media 159 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/media_source_state.h ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698