media/gpu/ipc/common/gpu_video_accelerator_util.cc - Issue 1677133003: Implemented parsing of HEVC codec ids

Side by Side Diff: media/gpu/ipc/common/gpu_video_accelerator_util.cc

Issue 1677133003: Implemented parsing of HEVC codec ids (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@parse-codec-id

Patch Set: Fixed handling of empty elements + added test cases with empty elements Created 4 years, 8 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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/gpu/ipc/common/gpu_video_accelerator_util.h"	5 #include "media/gpu/ipc/common/gpu_video_accelerator_util.h"

6	6

7 namespace media {	7 namespace media {

8	8

9 // Make sure the enum values of VideoCodecProfile and	9 // Make sure the enum values of VideoCodecProfile and

10 // gpu::VideoCodecProfile match.	10 // gpu::VideoCodecProfile match.

(...skipping 12 matching lines...) Expand all Loading...
23 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_HIGH444PREDICTIVEPROFILE);	23 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_HIGH444PREDICTIVEPROFILE);

24 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_SCALABLEBASELINE);	24 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_SCALABLEBASELINE);

25 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_SCALABLEHIGH);	25 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_SCALABLEHIGH);

26 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_STEREOHIGH);	26 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_STEREOHIGH);

27 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_MULTIVIEWHIGH);	27 STATIC_ASSERT_ENUM_MATCH(H264PROFILE_MULTIVIEWHIGH);

28 STATIC_ASSERT_ENUM_MATCH(VP8PROFILE_ANY);	28 STATIC_ASSERT_ENUM_MATCH(VP8PROFILE_ANY);

29 STATIC_ASSERT_ENUM_MATCH(VP9PROFILE_PROFILE0);	29 STATIC_ASSERT_ENUM_MATCH(VP9PROFILE_PROFILE0);

30 STATIC_ASSERT_ENUM_MATCH(VP9PROFILE_PROFILE1);	30 STATIC_ASSERT_ENUM_MATCH(VP9PROFILE_PROFILE1);

31 STATIC_ASSERT_ENUM_MATCH(VP9PROFILE_PROFILE2);	31 STATIC_ASSERT_ENUM_MATCH(VP9PROFILE_PROFILE2);

32 STATIC_ASSERT_ENUM_MATCH(VP9PROFILE_PROFILE3);	32 STATIC_ASSERT_ENUM_MATCH(VP9PROFILE_PROFILE3);

	33 STATIC_ASSERT_ENUM_MATCH(HEVCPROFILE_MAIN);

	34 STATIC_ASSERT_ENUM_MATCH(HEVCPROFILE_MAIN10);

	35 STATIC_ASSERT_ENUM_MATCH(HEVCPROFILE_MAIN_STILL_PICTURE);

33 STATIC_ASSERT_ENUM_MATCH(VIDEO_CODEC_PROFILE_MAX);	36 STATIC_ASSERT_ENUM_MATCH(VIDEO_CODEC_PROFILE_MAX);

34	37

35 // static	38 // static

36 VideoDecodeAccelerator::Capabilities	39 VideoDecodeAccelerator::Capabilities

37 GpuVideoAcceleratorUtil::ConvertGpuToMediaDecodeCapabilities(	40 GpuVideoAcceleratorUtil::ConvertGpuToMediaDecodeCapabilities(

38 const gpu::VideoDecodeAcceleratorCapabilities& gpu_capabilities) {	41 const gpu::VideoDecodeAcceleratorCapabilities& gpu_capabilities) {

39 VideoDecodeAccelerator::Capabilities capabilities;	42 VideoDecodeAccelerator::Capabilities capabilities;

40 capabilities.supported_profiles =	43 capabilities.supported_profiles =

41 ConvertGpuToMediaDecodeProfiles(gpu_capabilities.supported_profiles);	44 ConvertGpuToMediaDecodeProfiles(gpu_capabilities.supported_profiles);

42 capabilities.flags = gpu_capabilities.flags;	45 capabilities.flags = gpu_capabilities.flags;

(...skipping 105 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
148 duplicate = true;	151 duplicate = true;

149 break;	152 break;

150 }	153 }

151 }	154 }

152 if (!duplicate)	155 if (!duplicate)

153 media_profiles->push_back(profile);	156 media_profiles->push_back(profile);

154 }	157 }

155 }	158 }

156	159

157 } // namespace media	160 } // namespace media

OLD	NEW

« media/base/video_codecs.cc ('K') | « media/base/video_decoder_config.cc ('k') | media/mojo/common/media_type_converters.cc » ('j') | no next file with comments »