OLD | NEW |
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 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1064 | 1064 |
1065 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); | 1065 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); |
1066 ASSERT_TRUE(stream); | 1066 ASSERT_TRUE(stream); |
1067 | 1067 |
1068 const VideoDecoderConfig& video_config = stream->video_decoder_config(); | 1068 const VideoDecoderConfig& video_config = stream->video_decoder_config(); |
1069 EXPECT_EQ(gfx::Size(639, 360), video_config.natural_size()); | 1069 EXPECT_EQ(gfx::Size(639, 360), video_config.natural_size()); |
1070 } | 1070 } |
1071 | 1071 |
1072 #endif | 1072 #endif |
1073 | 1073 |
| 1074 #if defined(USE_PROPRIETARY_CODECS) && defined(ENABLE_HEVC_DEMUXING) |
| 1075 TEST_F(FFmpegDemuxerTest, HEVC_in_MP4_container) { |
| 1076 CreateDemuxer("bear-hevc-frag.mp4"); |
| 1077 InitializeDemuxer(); |
| 1078 |
| 1079 DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO); |
| 1080 ASSERT_TRUE(video); |
| 1081 |
| 1082 video->Read(NewReadCB(FROM_HERE, 3569, 66733, true)); |
| 1083 message_loop_.Run(); |
| 1084 |
| 1085 video->Read(NewReadCB(FROM_HERE, 1042, 200200, false)); |
| 1086 message_loop_.Run(); |
| 1087 } |
| 1088 #endif |
| 1089 |
1074 } // namespace media | 1090 } // namespace media |
OLD | NEW |