zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace VideoEncoderFactory::QueryVideoEncoder with VideoEncoder::GetEncoderInfo

Browse Source 
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}
This commit is contained in:
Mirta Dvornicic
2018-12-05 13:22:09 +01:00
committed by Commit Bot
parent 0b6d0e6e38
commit cdc5eb0de1
26 changed files with 91 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/video_codecs/BUILD.gn
View File

@ -27,6 +27,7 @@ rtc_source_set("video_codecs_api") {
"video_encoder.h",
"video_encoder_config.cc",
"video_encoder_config.h",
"video_encoder_factory.cc",
"video_encoder_factory.h",
"vp8_temporal_layers.h",
]

11
api/video_codecs/builtin_video_encoder_factory.cc
View File

@ -44,17 +44,6 @@ class BuiltinVideoEncoderFactory : public VideoEncoderFactory {
BuiltinVideoEncoderFactory()
: internal_encoder_factory_(new InternalEncoderFactory()) {}
VideoEncoderFactory::CodecInfo QueryVideoEncoder(
const SdpVideoFormat& format) const override {
// Format must be one of the internal formats.
RTC_DCHECK(IsFormatSupported(
internal_encoder_factory_->GetSupportedFormats(), format));
VideoEncoderFactory::CodecInfo info;
info.has_internal_source = false;
info.is_hardware_accelerated = false;
return info;
}
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override {
// Try creating internal encoder.

26
api/video_codecs/video_encoder_factory.cc Normal file
View File

@ -0,0 +1,26 @@
/*
* Copyright (c) 2018 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 "api/video_codecs/video_encoder_factory.h"
// TODO(webrtc:10065) Remove once downstream projects have been updated.
namespace webrtc {
VideoEncoderFactory::CodecInfo::CodecInfo()
: is_hardware_accelerated(false), has_internal_source(false) {}
VideoEncoderFactory::CodecInfo::~CodecInfo() = default;
VideoEncoderFactory::CodecInfo VideoEncoderFactory::QueryVideoEncoder(
const SdpVideoFormat& format) const {
return CodecInfo();
}
} // namespace webrtc

5
api/video_codecs/video_encoder_factory.h
View File

@ -25,6 +25,9 @@ class VideoEncoderFactory {
public:
// TODO(magjed): Try to get rid of this struct.
struct CodecInfo {
CodecInfo();
~CodecInfo();
// |is_hardware_accelerated| is true if the encoders created by this factory
// of the given codec will use hardware support.
bool is_hardware_accelerated;
@ -43,7 +46,7 @@ class VideoEncoderFactory {
// Returns information about how this format will be encoded. The specified
// format must be one of the supported formats by this factory.
// TODO(magjed): Try to get rid of this method.
virtual CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const = 0;
virtual CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const;
// Creates a VideoEncoder for the specified format.
virtual std::unique_ptr<VideoEncoder> CreateVideoEncoder(