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

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

Issue 1207423003: Roll FFmpeg for M45. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pointing deps to updated ffmpeg master Created 5 years, 5 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 <algorithm> 5 #include <algorithm>
6 #include <deque> 6 #include <deque>
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2767))); 629 EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2767)));
630 ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::AUDIO)); 630 ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::AUDIO));
631 ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::VIDEO)); 631 ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::VIDEO));
632 } 632 }
633 633
634 TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration_VideoOnly) { 634 TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration_VideoOnly) {
635 // Verify that end of stream buffers are created. 635 // Verify that end of stream buffers are created.
636 CreateDemuxer("bear-320x240-video-only.webm"); 636 CreateDemuxer("bear-320x240-video-only.webm");
637 InitializeDemuxer(); 637 InitializeDemuxer();
638 set_duration_known(false); 638 set_duration_known(false);
639 EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2703))); 639 EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2736)));
640 ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::VIDEO)); 640 ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::VIDEO));
641 } 641 }
642 642
643 TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration_AudioOnly) { 643 TEST_F(FFmpegDemuxerTest, Read_EndOfStream_NoDuration_AudioOnly) {
644 // Verify that end of stream buffers are created. 644 // Verify that end of stream buffers are created.
645 CreateDemuxer("bear-320x240-audio-only.webm"); 645 CreateDemuxer("bear-320x240-audio-only.webm");
646 InitializeDemuxer(); 646 InitializeDemuxer();
647 set_duration_known(false); 647 set_duration_known(false);
648 EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2767))); 648 EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(2767)));
649 ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::AUDIO)); 649 ReadUntilEndOfStream(demuxer_->GetStream(DemuxerStream::AUDIO));
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 InitializeDemuxer(); 968 InitializeDemuxer();
969 969
970 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); 970 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
971 ASSERT_TRUE(stream); 971 ASSERT_TRUE(stream);
972 ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation()); 972 ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation());
973 } 973 }
974 974
975 #endif 975 #endif
976 976
977 } // namespace media 977 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698