509e4fe8e6
Reason for revert:
The WebRtcBrowserTest.NegotiateUnsupportedVideoCodec test has been fixed in Chromium with the following change:
function removeVideoCodec(offerSdp) {
- offerSdp = offerSdp.replace('a=rtpmap:100 VP8/90000\r\n',
- 'a=rtpmap:100 XVP8/90000\r\n');
+ offerSdp = offerSdp.replace(/a=rtpmap:(\d+)\ VP8\/90000\r\n/,
+ 'a=rtpmap:$1 XVP8/90000\r\n');
return offerSdp;
}
Original issue's description:
> Revert of Stop using hardcoded payload types for video codecs (patchset #6 id:210001 of https://codereview.webrtc.org/2493133002/ )
>
> 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
>
> Committed: https://crrev.com/eacbaea920797ff751ca83050d140821f5055591
> Cr-Commit-Position: refs/heads/master@{#15140}
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/2511933002
Cr-Commit-Position: refs/heads/master@{#15148}
69 lines
2.3 KiB
C++
69 lines
2.3 KiB
C++
/*
|
|
* Copyright (c) 2016 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/media/engine/internalencoderfactory.h"
|
|
|
|
#include <utility>
|
|
|
|
#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 cricket {
|
|
|
|
InternalEncoderFactory::InternalEncoderFactory() {
|
|
supported_codecs_.push_back(cricket::VideoCodec(kVp8CodecName));
|
|
if (webrtc::VP9Encoder::IsSupported())
|
|
supported_codecs_.push_back(cricket::VideoCodec(kVp9CodecName));
|
|
if (webrtc::H264Encoder::IsSupported()) {
|
|
cricket::VideoCodec codec(kH264CodecName);
|
|
// TODO(magjed): Move setting these parameters into webrtc::H264Encoder
|
|
// instead.
|
|
// TODO(hta): Set FMTP parameters for all codecs of type H264.
|
|
codec.SetParam(kH264FmtpProfileLevelId,
|
|
kH264ProfileLevelConstrainedBaseline);
|
|
codec.SetParam(kH264FmtpLevelAsymmetryAllowed, "1");
|
|
codec.SetParam(kH264FmtpPacketizationMode, "1");
|
|
supported_codecs_.push_back(std::move(codec));
|
|
}
|
|
|
|
supported_codecs_.push_back(cricket::VideoCodec(kRedCodecName));
|
|
supported_codecs_.push_back(cricket::VideoCodec(kUlpfecCodecName));
|
|
}
|
|
|
|
InternalEncoderFactory::~InternalEncoderFactory() {}
|
|
|
|
// WebRtcVideoEncoderFactory implementation.
|
|
webrtc::VideoEncoder* InternalEncoderFactory::CreateVideoEncoder(
|
|
const cricket::VideoCodec& codec) {
|
|
switch (CodecTypeFromName(codec.name)) {
|
|
case webrtc::kVideoCodecH264:
|
|
return webrtc::H264Encoder::Create();
|
|
case webrtc::kVideoCodecVP8:
|
|
return webrtc::VP8Encoder::Create();
|
|
case webrtc::kVideoCodecVP9:
|
|
return webrtc::VP9Encoder::Create();
|
|
default:
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
const std::vector<cricket::VideoCodec>&
|
|
InternalEncoderFactory::supported_codecs() const {
|
|
return supported_codecs_;
|
|
}
|
|
|
|
void InternalEncoderFactory::DestroyVideoEncoder(
|
|
webrtc::VideoEncoder* encoder) {
|
|
delete encoder;
|
|
}
|
|
|
|
} // namespace cricket
|