This is a reland of 154ee1fd8547768a49b7d67ce586ef5d3c5d9ebc Original change's description: > Move ulpfec, red, and flexfec codec to video engine > > These codecs are currently being added in the internal encoder factory. > This means that the new injectable video codec factories will miss them. > This CL moves adding them into the video engine so that both factory > types will get them. > > This CL makes a functional change in that RED, ULPFEC, and FlexFec will > be placed after both the internal and external codecs. Previously, > it was placed between the internal and external codecs. > > Bug: webrtc:8527 > Change-Id: I5aa7a3ca674f621b17cf3aa095a225c753488e09 > Reviewed-on: https://webrtc-review.googlesource.com/22964 > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20700} TBR=brandt@webrtc.org Bug: webrtc:8527 Change-Id: I79ced9a909fd424f1308d62e449268dcc9289538 Reviewed-on: https://webrtc-review.googlesource.com/24060 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20749}
60 lines
1.9 KiB
C++
60 lines
1.9 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 "media/engine/internalencoderfactory.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "modules/video_coding/codecs/h264/include/h264.h"
|
|
#include "modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "modules/video_coding/codecs/vp9/include/vp9.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace webrtc {
|
|
|
|
std::vector<SdpVideoFormat> InternalEncoderFactory::GetSupportedFormats()
|
|
const {
|
|
std::vector<SdpVideoFormat> supported_codecs;
|
|
supported_codecs.push_back(SdpVideoFormat(cricket::kVp8CodecName));
|
|
if (webrtc::VP9Encoder::IsSupported())
|
|
supported_codecs.push_back(SdpVideoFormat(cricket::kVp9CodecName));
|
|
|
|
for (const webrtc::SdpVideoFormat& format : webrtc::SupportedH264Codecs())
|
|
supported_codecs.push_back(format);
|
|
|
|
return supported_codecs;
|
|
}
|
|
|
|
VideoEncoderFactory::CodecInfo InternalEncoderFactory::QueryVideoEncoder(
|
|
const SdpVideoFormat& format) const {
|
|
CodecInfo info;
|
|
info.is_hardware_accelerated = false;
|
|
info.has_internal_source = false;
|
|
return info;
|
|
}
|
|
|
|
std::unique_ptr<VideoEncoder> InternalEncoderFactory::CreateVideoEncoder(
|
|
const SdpVideoFormat& format) {
|
|
if (cricket::CodecNamesEq(format.name, cricket::kVp8CodecName))
|
|
return VP8Encoder::Create();
|
|
|
|
if (cricket::CodecNamesEq(format.name, cricket::kVp9CodecName))
|
|
return VP9Encoder::Create();
|
|
|
|
if (cricket::CodecNamesEq(format.name, cricket::kH264CodecName))
|
|
return H264Encoder::Create(cricket::VideoCodec(format));
|
|
|
|
RTC_LOG(LS_ERROR) << "Trying to created encoder of unsupported format "
|
|
<< format.name;
|
|
return nullptr;
|
|
}
|
|
|
|
} // namespace webrtc
|