1ec2a16121
This reverts commit cdc5eb0de179dcc866ef770ea303879c64466879. Reason for revert: Causes wrong CPU adaptation to be used for some HW codecs since GetEncoderInfo() is polled before InitEncode(). Original change's description: > Replace VideoEncoderFactory::QueryVideoEncoder with VideoEncoder::GetEncoderInfo > > Make implementation of VideoEncoderFactory::QueryVideoEncoder optional > until it is removed downstream and remove all implementations of it. > > Bug: webrtc:10065 > Change-Id: Ibb1f9612234e536651ce53f05ee048a5d172a41f > Reviewed-on: https://webrtc-review.googlesource.com/c/113065 > Commit-Queue: Mirta Dvornicic <mirtad@webrtc.org> > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > Reviewed-by: Per Kjellander <perkj@webrtc.org> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Reviewed-by: Kári Helgason <kthelgason@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25924} TBR=brandtr@webrtc.org,sakal@webrtc.org,kthelgason@webrtc.org,sprang@webrtc.org,srte@webrtc.org,perkj@webrtc.org,mirtad@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10065 Change-Id: Idaa452e1d8c1c58cdb4ec69b88fce9042589cc3c Reviewed-on: https://webrtc-review.googlesource.com/c/113800 Reviewed-by: Mirta Dvornicic <mirtad@webrtc.org> Reviewed-by: Per Kjellander <perkj@webrtc.org> Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Mirta Dvornicic <mirtad@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25943}
59 lines
2.1 KiB
C++
59 lines
2.1 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 <string>
|
|
|
|
#include "absl/strings/match.h"
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "media/base/codec.h"
|
|
#include "media/base/mediaconstants.h"
|
|
#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));
|
|
for (const webrtc::SdpVideoFormat& format : webrtc::SupportedVP9Codecs())
|
|
supported_codecs.push_back(format);
|
|
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 (absl::EqualsIgnoreCase(format.name, cricket::kVp8CodecName))
|
|
return VP8Encoder::Create();
|
|
if (absl::EqualsIgnoreCase(format.name, cricket::kVp9CodecName))
|
|
return VP9Encoder::Create(cricket::VideoCodec(format));
|
|
if (absl::EqualsIgnoreCase(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
|