eacbaea920
Reason for revert: Breaks chromium.fyi test: WebRtcBrowserTest.NegotiateUnsupportedVideoCodec Original issue's description: > Stop using hardcoded payload types for video codecs > > This CL stops using hardcoded payload types for different video codecs > and will dynamically assign them payload types incrementally from 96 to > 127 instead. > > This CL: > * Replaces 'std::vector<VideoCodec> DefaultVideoCodecList()' in > webrtcvideoengine2.cc with an explicit WebRtcVideoEncoderFactory for > internally supported software codecs instead. The purpose is to > streamline the payload type assignment in webrtcvideoengine2.cc which > will now have two encoder factories of the same > WebRtcVideoEncoderFactory type; one internal and one external. > * Removes webrtc::VideoEncoder::EncoderType and use cricket::VideoCodec > instead. > * Removes 'static VideoEncoder* Create(EncoderType codec_type)' and > moves the create function to the internal encoder factory instead. > * Removes video_encoder.cc. webrtc::VideoEncoder is now just an > interface without any static functions. > * The function GetSupportedCodecs in webrtcvideoengine2.cc unifies > the internal and external codecs and assigns them payload types > incrementally from 96 to 127. > * Updates webrtcvideoengine2_unittest.cc and removes assumptions about > what payload types will be used. > > BUG=webrtc:6677,webrtc:6705 > R=hta@webrtc.org, ossu@webrtc.org, stefan@webrtc.org > > Committed: https://crrev.com/42043b95872b51321f508bf255d804ce3dff366b > Cr-Commit-Position: refs/heads/master@{#15135} TBR=hta@webrtc.org,stefan@webrtc.org,ossu@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6677,webrtc:6705 Review-Url: https://codereview.webrtc.org/2513633002 Cr-Commit-Position: refs/heads/master@{#15140}
68 lines
1.8 KiB
C++
68 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/video_encoder.h"
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
|
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
|
|
|
|
namespace webrtc {
|
|
VideoEncoder* VideoEncoder::Create(VideoEncoder::EncoderType codec_type) {
|
|
RTC_DCHECK(IsSupportedSoftware(codec_type));
|
|
switch (codec_type) {
|
|
case kH264:
|
|
return H264Encoder::Create();
|
|
case kVp8:
|
|
return VP8Encoder::Create();
|
|
case kVp9:
|
|
return VP9Encoder::Create();
|
|
case kUnsupportedCodec:
|
|
RTC_NOTREACHED();
|
|
return nullptr;
|
|
}
|
|
RTC_NOTREACHED();
|
|
return nullptr;
|
|
}
|
|
|
|
bool VideoEncoder::IsSupportedSoftware(EncoderType codec_type) {
|
|
switch (codec_type) {
|
|
case kH264:
|
|
return H264Encoder::IsSupported();
|
|
case kVp8:
|
|
return true;
|
|
case kVp9:
|
|
return VP9Encoder::IsSupported();
|
|
case kUnsupportedCodec:
|
|
RTC_NOTREACHED();
|
|
return false;
|
|
}
|
|
RTC_NOTREACHED();
|
|
return false;
|
|
}
|
|
|
|
VideoEncoder::EncoderType VideoEncoder::CodecToEncoderType(
|
|
VideoCodecType codec_type) {
|
|
switch (codec_type) {
|
|
case kVideoCodecH264:
|
|
return VideoEncoder::kH264;
|
|
case kVideoCodecVP8:
|
|
return VideoEncoder::kVp8;
|
|
case kVideoCodecVP9:
|
|
return VideoEncoder::kVp9;
|
|
default:
|
|
return VideoEncoder::kUnsupportedCodec;
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|