mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
1ec2a16121
This reverts commit cdc5eb0de1.
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}
57 lines
2.1 KiB
C++
57 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2017 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.
|
|
*/
|
|
|
|
#ifndef API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_
|
|
#define API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
namespace webrtc {
|
|
|
|
class VideoEncoder;
|
|
struct SdpVideoFormat;
|
|
|
|
// A factory that creates VideoEncoders.
|
|
// NOTE: This class is still under development and may change without notice.
|
|
class VideoEncoderFactory {
|
|
public:
|
|
// TODO(magjed): Try to get rid of this struct.
|
|
struct 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;
|
|
// |has_internal_source| is true if encoders created by this factory of the
|
|
// given codec will use internal camera sources, meaning that they don't
|
|
// require/expect frames to be delivered via webrtc::VideoEncoder::Encode.
|
|
// This flag is used as the internal_source parameter to
|
|
// webrtc::ViEExternalCodec::RegisterExternalSendCodec.
|
|
bool has_internal_source;
|
|
};
|
|
|
|
// Returns a list of supported video formats in order of preference, to use
|
|
// for signaling etc.
|
|
virtual std::vector<SdpVideoFormat> GetSupportedFormats() const = 0;
|
|
|
|
// 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;
|
|
|
|
// Creates a VideoEncoder for the specified format.
|
|
virtual std::unique_ptr<VideoEncoder> CreateVideoEncoder(
|
|
const SdpVideoFormat& format) = 0;
|
|
|
|
virtual ~VideoEncoderFactory() {}
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_
|