OLD | NEW |
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 "media/formats/mp4/box_definitions.h" | 5 #include "media/formats/mp4/box_definitions.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
674 break; | 674 break; |
675 } | 675 } |
676 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) | 676 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) |
677 case FOURCC_HEV1: | 677 case FOURCC_HEV1: |
678 case FOURCC_HVC1: { | 678 case FOURCC_HVC1: { |
679 DVLOG(2) << __FUNCTION__ | 679 DVLOG(2) << __FUNCTION__ |
680 << " parsing HEVCDecoderConfigurationRecord (hvcC)"; | 680 << " parsing HEVCDecoderConfigurationRecord (hvcC)"; |
681 std::unique_ptr<HEVCDecoderConfigurationRecord> hevcConfig( | 681 std::unique_ptr<HEVCDecoderConfigurationRecord> hevcConfig( |
682 new HEVCDecoderConfigurationRecord()); | 682 new HEVCDecoderConfigurationRecord()); |
683 RCHECK(reader->ReadChild(hevcConfig.get())); | 683 RCHECK(reader->ReadChild(hevcConfig.get())); |
| 684 video_codec = kCodecHEVC; |
| 685 video_codec_profile = hevcConfig->GetVideoProfile(); |
684 frame_bitstream_converter = | 686 frame_bitstream_converter = |
685 make_scoped_refptr(new HEVCBitstreamConverter(std::move(hevcConfig))); | 687 make_scoped_refptr(new HEVCBitstreamConverter(std::move(hevcConfig))); |
686 video_codec = kCodecHEVC; | |
687 break; | 688 break; |
688 } | 689 } |
689 #endif | 690 #endif |
690 case FOURCC_VP09: | 691 case FOURCC_VP09: |
691 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 692 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
692 switches::kEnableVp9InMp4)) { | 693 switches::kEnableVp9InMp4)) { |
693 DVLOG(2) << __FUNCTION__ | 694 DVLOG(2) << __FUNCTION__ |
694 << " parsing VPCodecConfigurationRecord (vpcC)"; | 695 << " parsing VPCodecConfigurationRecord (vpcC)"; |
695 std::unique_ptr<VPCodecConfigurationRecord> vp_config( | 696 std::unique_ptr<VPCodecConfigurationRecord> vp_config( |
696 new VPCodecConfigurationRecord()); | 697 new VPCodecConfigurationRecord()); |
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 SampleDependsOn IndependentAndDisposableSamples::sample_depends_on( | 1275 SampleDependsOn IndependentAndDisposableSamples::sample_depends_on( |
1275 size_t i) const { | 1276 size_t i) const { |
1276 if (i >= sample_depends_on_.size()) | 1277 if (i >= sample_depends_on_.size()) |
1277 return kSampleDependsOnUnknown; | 1278 return kSampleDependsOnUnknown; |
1278 | 1279 |
1279 return sample_depends_on_[i]; | 1280 return sample_depends_on_[i]; |
1280 } | 1281 } |
1281 | 1282 |
1282 } // namespace mp4 | 1283 } // namespace mp4 |
1283 } // namespace media | 1284 } // namespace media |
OLD | NEW |