From 221ee3c3ca3eeca9e5d4a2a69be4bb51a83764ba Mon Sep 17 00:00:00 2001 From: Max Morin Date: Fri, 14 Sep 2018 07:50:07 +0000 Subject: [PATCH] Revert "Reland Profile 2 to default profiles" This reverts commit f682624062b36c285d909d6153bdf9165f6b4c63. Reason for revert: WebRtcVideoQualityBrowserTests/WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityVp9/0 and /1 failing on Linux, Mac, and Windows. E.g. https://ci.chromium.org/buildbot/chromium.webrtc/Mac%20Tester/83189. Original change's description: > Reland Profile 2 to default profiles > > This is a reland after chrome browser tests are updated. > > Bug: webrtc:9376 > Change-Id: I1c32ddcd2478e5a92fd3950876c7c19d35c1d79b > TBR: niklas.enbom@webrtc.org > Reviewed-on: https://webrtc-review.googlesource.com/88583 > Commit-Queue: Emircan Uysaler > Reviewed-by: Emircan Uysaler > Cr-Commit-Position: refs/heads/master@{#24736} TBR=emircan@webrtc.org Change-Id: Ibd072ce01506b481e6300b11e7f7ef85f79daf95 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9376 Reviewed-on: https://webrtc-review.googlesource.com/100421 Reviewed-by: Max Morin Commit-Queue: Max Morin Cr-Commit-Position: refs/heads/master@{#24739} --- modules/video_coding/codecs/vp9/vp9_impl.cc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc index 262123e2d5..acbb8751b5 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -114,22 +114,10 @@ ColorSpace ExtractVP9ColorSpace(vpx_color_space_t space_t, } // namespace std::vector SupportedVP9Codecs() { - // Profile 2 might not be available on some platforms until - // https://bugs.chromium.org/p/webm/issues/detail?id=1544 is solved. - static bool vpx_supports_high_bit_depth = - (vpx_codec_get_caps(vpx_codec_vp9_cx()) & VPX_CODEC_CAP_HIGHBITDEPTH) != - 0 && - (vpx_codec_get_caps(vpx_codec_vp9_dx()) & VPX_CODEC_CAP_HIGHBITDEPTH) != - 0; - + // TODO(emircan): Add Profile 2 support after fixing browser_tests. std::vector supported_formats{SdpVideoFormat( cricket::kVp9CodecName, {{kVP9FmtpProfileId, VP9ProfileToString(VP9Profile::kProfile0)}})}; - if (vpx_supports_high_bit_depth) { - supported_formats.push_back(SdpVideoFormat( - cricket::kVp9CodecName, - {{kVP9FmtpProfileId, VP9ProfileToString(VP9Profile::kProfile2)}})); - } return supported_formats; }