From a750333372f45d785f746d6cf308e4e7d87b83ac Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Wed, 1 Nov 2017 08:52:03 +0100 Subject: [PATCH] Remove support for SW H264 High profile decoding Also put Baseline profile in front of Constrained Baseline profile. The reason is that the HW encoders are mostly BP, and we want this to be the first codec in the list so that HW is preferred by default. The H264 tests in chromium needs to be updated again with this change, which was changed here: https://codereview.chromium.org/2985263002/. Bug: webrtc:8317 Change-Id: Ief75683962b79b6664143d73b9259729c66ce082 Reviewed-on: https://webrtc-review.googlesource.com/17780 Reviewed-by: Rasmus Brandt Commit-Queue: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#20554} --- modules/video_coding/codecs/h264/h264.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/video_coding/codecs/h264/h264.cc b/modules/video_coding/codecs/h264/h264.cc index d7ed3b42e8..b39b21b83e 100644 --- a/modules/video_coding/codecs/h264/h264.cc +++ b/modules/video_coding/codecs/h264/h264.cc @@ -66,9 +66,8 @@ std::vector SupportedH264Codecs() { // decoder for that profile is required to be able to decode CBP. This means // we can encode and send CBP even though we negotiated a potentially // higher profile. See the H264 spec for more information. - return {CreateH264Format(H264::kProfileHigh, H264::kLevel3_1), - CreateH264Format(H264::kProfileConstrainedBaseline, H264::kLevel3_1), - CreateH264Format(H264::kProfileBaseline, H264::kLevel3_1)}; + return {CreateH264Format(H264::kProfileBaseline, H264::kLevel3_1), + CreateH264Format(H264::kProfileConstrainedBaseline, H264::kLevel3_1)}; } H264Encoder* H264Encoder::Create(const cricket::VideoCodec& codec) {