From 4da382e34de4e6ce66c65396fba896c2c15c21e3 Mon Sep 17 00:00:00 2001 From: Henrik Andreassson Date: Mon, 3 Dec 2018 10:46:38 +0000 Subject: [PATCH] Speculative revert due to a long history of issues related to VP9 on Mac. See https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc/WebRTC%20Chromium%20Mac%20Tester First, we figured that "ba2840c Various VP9 high fps fixes by Ilya Nikolaevskiy" was the cause and it was reverted but it did not help. We must now try the other CL which had done changed in VP9. Revert "Reland Profile 2 to default profiles" This reverts commit 4c0cc5bc5fa027b9392ff2886e731bea3aac7602. Reason for revert: 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: I818bf5d447da7901ffe49f2c452decb89196e829 > TBR: niklas.enbom@webrtc.org > Reviewed-on: https://webrtc-review.googlesource.com/c/112060 > Reviewed-by: Emircan Uysaler > Commit-Queue: Emircan Uysaler > Cr-Commit-Position: refs/heads/master@{#25778} TBR=emircan@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9376 Change-Id: I3eb935c08341ce51fa16717ed7b3be5f5253aa2f Reviewed-on: https://webrtc-review.googlesource.com/c/112597 Reviewed-by: Henrik Andreassson Commit-Queue: Henrik Andreassson Cr-Commit-Position: refs/heads/master@{#25874} --- modules/video_coding/codecs/vp9/vp9.cc | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/modules/video_coding/codecs/vp9/vp9.cc b/modules/video_coding/codecs/vp9/vp9.cc index 22a0888120..59cc66707e 100644 --- a/modules/video_coding/codecs/vp9/vp9.cc +++ b/modules/video_coding/codecs/vp9/vp9.cc @@ -14,30 +14,15 @@ #include "api/video_codecs/sdp_video_format.h" #include "modules/video_coding/codecs/vp9/vp9_impl.h" #include "rtc_base/checks.h" -#include "vpx/vp8cx.h" -#include "vpx/vp8dx.h" -#include "vpx/vpx_codec.h" namespace webrtc { std::vector SupportedVP9Codecs() { #ifdef RTC_ENABLE_VP9 - // 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; #else return std::vector();