| 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 919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 930 | 930 |
| 931 stream->Read(base::Bind(&ValidateAnnexB, stream)); | 931 stream->Read(base::Bind(&ValidateAnnexB, stream)); |
| 932 message_loop_.Run(); | 932 message_loop_.Run(); |
| 933 | 933 |
| 934 demuxer_->Stop(); | 934 demuxer_->Stop(); |
| 935 demuxer_.reset(); | 935 demuxer_.reset(); |
| 936 data_source_.reset(); | 936 data_source_.reset(); |
| 937 } | 937 } |
| 938 } | 938 } |
| 939 | 939 |
| 940 #if defined(ENABLE_HEVC_DEMUXING) |
| 941 TEST_F(FFmpegDemuxerTest, HEVC_in_MP4_container) { |
| 942 CreateDemuxer("bear-hevc-frag.mp4"); |
| 943 InitializeDemuxer(); |
| 944 |
| 945 DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO); |
| 946 ASSERT_TRUE(video); |
| 947 |
| 948 video->Read(NewReadCB(FROM_HERE, 3569, 66733, true)); |
| 949 message_loop_.Run(); |
| 950 |
| 951 video->Read(NewReadCB(FROM_HERE, 1042, 200200, false)); |
| 952 message_loop_.Run(); |
| 953 } |
| 954 #endif |
| 955 |
| 940 TEST_F(FFmpegDemuxerTest, Rotate_Metadata_0) { | 956 TEST_F(FFmpegDemuxerTest, Rotate_Metadata_0) { |
| 941 CreateDemuxer("bear_rotate_0.mp4"); | 957 CreateDemuxer("bear_rotate_0.mp4"); |
| 942 InitializeDemuxer(); | 958 InitializeDemuxer(); |
| 943 | 959 |
| 944 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); | 960 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); |
| 945 ASSERT_TRUE(stream); | 961 ASSERT_TRUE(stream); |
| 946 ASSERT_EQ(VIDEO_ROTATION_0, stream->video_rotation()); | 962 ASSERT_EQ(VIDEO_ROTATION_0, stream->video_rotation()); |
| 947 } | 963 } |
| 948 | 964 |
| 949 TEST_F(FFmpegDemuxerTest, Rotate_Metadata_90) { | 965 TEST_F(FFmpegDemuxerTest, Rotate_Metadata_90) { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 969 InitializeDemuxer(); | 985 InitializeDemuxer(); |
| 970 | 986 |
| 971 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); | 987 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); |
| 972 ASSERT_TRUE(stream); | 988 ASSERT_TRUE(stream); |
| 973 ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation()); | 989 ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation()); |
| 974 } | 990 } |
| 975 | 991 |
| 976 #endif | 992 #endif |
| 977 | 993 |
| 978 } // namespace media | 994 } // namespace media |
| OLD | NEW |