| 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 "media/filters/chunk_demuxer.h" | 5 #include "media/filters/chunk_demuxer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 4767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4778 }; | 4778 }; |
| 4779 | 4779 |
| 4780 TEST_P(ChunkDemuxerMp4Vp9Test, CodecSupport) { | 4780 TEST_P(ChunkDemuxerMp4Vp9Test, CodecSupport) { |
| 4781 ChunkDemuxer::Status expected = ChunkDemuxer::kNotSupported; | 4781 ChunkDemuxer::Status expected = ChunkDemuxer::kNotSupported; |
| 4782 | 4782 |
| 4783 #if BUILDFLAG(USE_PROPRIETARY_CODECS) | 4783 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
| 4784 const bool enable_mp4_vp9_demuxing = GetParam(); | 4784 const bool enable_mp4_vp9_demuxing = GetParam(); |
| 4785 if (enable_mp4_vp9_demuxing) { | 4785 if (enable_mp4_vp9_demuxing) { |
| 4786 expected = ChunkDemuxer::kOk; | 4786 expected = ChunkDemuxer::kOk; |
| 4787 } else { | 4787 } else { |
| 4788 EXPECT_MEDIA_LOG(HasSubstr( | 4788 EXPECT_MEDIA_LOG( |
| 4789 "Codec 'vp09.00.01.08.02.01.01.00' is not supported for 'video/mp4'")); | 4789 HasSubstr("Codec 'vp09.00.10.08' is not supported for 'video/mp4'")); |
| 4790 } | 4790 } |
| 4791 #endif | 4791 #endif |
| 4792 | 4792 |
| 4793 EXPECT_EQ( | 4793 EXPECT_EQ(demuxer_->AddId("source_id", "video/mp4", "vp09.00.10.08"), |
| 4794 demuxer_->AddId("source_id", "video/mp4", "vp09.00.01.08.02.01.01.00"), | 4794 expected); |
| 4795 expected); | |
| 4796 } | 4795 } |
| 4797 | 4796 |
| 4798 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing, | 4797 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing, |
| 4799 ChunkDemuxerMp4Vp9Test, | 4798 ChunkDemuxerMp4Vp9Test, |
| 4800 ::testing::Bool()); | 4799 ::testing::Bool()); |
| 4801 | 4800 |
| 4802 } // namespace media | 4801 } // namespace media |
| OLD | NEW |