From 1d87148a4fadc3d959e84c7c1934ad922c43449c Mon Sep 17 00:00:00 2001 From: Yura Yaroshevich Date: Wed, 2 May 2018 13:06:34 +0300 Subject: [PATCH] Fixed init of H.264 profile/level support table on iOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9134, webrtc:7992 Change-Id: Ideabfae10532f815a3e95b18bad8e950da53306b Reviewed-on: https://webrtc-review.googlesource.com/73700 Reviewed-by: Kári Helgason Reviewed-by: Magnus Jedvert Commit-Queue: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#23123} --- media/base/h264_profile_level_id.h | 2 +- sdk/objc/Framework/Classes/Video/UIDevice+H264Profile.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/base/h264_profile_level_id.h b/media/base/h264_profile_level_id.h index 28899e53d9..f46efd3eb4 100644 --- a/media/base/h264_profile_level_id.h +++ b/media/base/h264_profile_level_id.h @@ -46,7 +46,7 @@ enum Level { }; struct ProfileLevelId { - ProfileLevelId(Profile profile, Level level) + constexpr ProfileLevelId(Profile profile, Level level) : profile(profile), level(level) {} Profile profile; Level level; diff --git a/sdk/objc/Framework/Classes/Video/UIDevice+H264Profile.mm b/sdk/objc/Framework/Classes/Video/UIDevice+H264Profile.mm index 41123a533b..ef94c14c8f 100644 --- a/sdk/objc/Framework/Classes/Video/UIDevice+H264Profile.mm +++ b/sdk/objc/Framework/Classes/Video/UIDevice+H264Profile.mm @@ -22,7 +22,7 @@ struct SupportedH264Profile { const ProfileLevelId profile; }; -const SupportedH264Profile kH264MaxSupportedProfiles[] = { +constexpr SupportedH264Profile kH264MaxSupportedProfiles[] = { // iPhones with at least iOS 9 {RTCDeviceTypeIPhoneX, {kProfileHigh, kLevel5_2}}, // https://support.apple.com/kb/SP770 {RTCDeviceTypeIPhone8, {kProfileHigh, kLevel5_2}}, // https://support.apple.com/kb/SP767