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

Side by Side Diff: media/filters/frame_processor_unittest.cc

Issue 2416183002: media: Use native DemuxerStream enum types in media mojo interfaces (Closed)
Patch Set: comments addressed Created 4 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
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/source_buffer_state.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 } 312 }
313 case DemuxerStream::VIDEO: { 313 case DemuxerStream::VIDEO: {
314 ASSERT_FALSE(video_); 314 ASSERT_FALSE(video_);
315 video_.reset(new ChunkDemuxerStream(DemuxerStream::VIDEO, true, "2")); 315 video_.reset(new ChunkDemuxerStream(DemuxerStream::VIDEO, true, "2"));
316 ASSERT_TRUE(video_->UpdateVideoConfig(TestVideoConfig::Normal(), 316 ASSERT_TRUE(video_->UpdateVideoConfig(TestVideoConfig::Normal(),
317 new MediaLog())); 317 new MediaLog()));
318 break; 318 break;
319 } 319 }
320 // TODO(wolenetz): Test text coded frame processing. 320 // TODO(wolenetz): Test text coded frame processing.
321 case DemuxerStream::TEXT: 321 case DemuxerStream::TEXT:
322 case DemuxerStream::UNKNOWN: 322 case DemuxerStream::UNKNOWN: {
323 case DemuxerStream::NUM_TYPES: {
324 ASSERT_FALSE(true); 323 ASSERT_FALSE(true);
325 } 324 }
326 } 325 }
327 } 326 }
328 327
329 DISALLOW_COPY_AND_ASSIGN(FrameProcessorTest); 328 DISALLOW_COPY_AND_ASSIGN(FrameProcessorTest);
330 }; 329 };
331 330
332 TEST_F(FrameProcessorTest, WrongTypeInAppendedBuffer) { 331 TEST_F(FrameProcessorTest, WrongTypeInAppendedBuffer) {
333 AddTestTracks(HAS_AUDIO); 332 AddTestTracks(HAS_AUDIO);
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 StreamParserBuffer* last_read_parser_buffer = 898 StreamParserBuffer* last_read_parser_buffer =
900 static_cast<StreamParserBuffer*>(last_read_buffer_.get()); 899 static_cast<StreamParserBuffer*>(last_read_buffer_.get());
901 ASSERT_EQ(base::TimeDelta::FromMilliseconds(0), 900 ASSERT_EQ(base::TimeDelta::FromMilliseconds(0),
902 last_read_parser_buffer->preroll_buffer()->duration()); 901 last_read_parser_buffer->preroll_buffer()->duration());
903 } 902 }
904 903
905 INSTANTIATE_TEST_CASE_P(SequenceMode, FrameProcessorTest, Values(true)); 904 INSTANTIATE_TEST_CASE_P(SequenceMode, FrameProcessorTest, Values(true));
906 INSTANTIATE_TEST_CASE_P(SegmentsMode, FrameProcessorTest, Values(false)); 905 INSTANTIATE_TEST_CASE_P(SegmentsMode, FrameProcessorTest, Values(false));
907 906
908 } // namespace media 907 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/source_buffer_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698