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

Remove deprecated VideoEncoder metadata methods

Browse Source 
Bug: webrtc:9890
Change-Id: Ie54fdb2727c49abbaab32848c6eeffc9d04a9229
Reviewed-on: https://webrtc-review.googlesource.com/c/111182
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25857}
This commit is contained in:
Erik Språng
2018-11-26 13:42:39 +01:00
committed by Commit Bot
parent 897a991618
commit 6ed4f14418
3 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/video_codecs/video_encoder.cc
View File

@ -106,25 +106,9 @@ int32_t VideoEncoder::SetRateAllocation(
return SetRates(allocation.get_sum_kbps(), framerate);
}
VideoEncoder::ScalingSettings VideoEncoder::GetScalingSettings() const {
return ScalingSettings::kOff;
}
bool VideoEncoder::SupportsNativeHandle() const {
return false;
}
const char* VideoEncoder::ImplementationName() const {
return "unknown";
}
// TODO(webrtc:9722): Remove and make pure virtual when the three legacy
// methods called here are gone.
// TODO(webrtc:9722): Remove and make pure virtual.
VideoEncoder::EncoderInfo VideoEncoder::GetEncoderInfo() const {
EncoderInfo info;
info.scaling_settings = GetScalingSettings();
info.supports_native_handle = SupportsNativeHandle();
info.implementation_name = ImplementationName();
return info;
return EncoderInfo();
}
} // namespace webrtc

6
api/video_codecs/video_encoder.h
View File

@ -229,12 +229,6 @@ class RTC_EXPORT VideoEncoder {
virtual int32_t SetRateAllocation(const VideoBitrateAllocation& allocation,
uint32_t framerate);
// GetScalingSettings(), SupportsNativeHandle(), ImplementationName() are
// deprecated, use GetEncoderInfo() instead.
virtual ScalingSettings GetScalingSettings() const;
virtual bool SupportsNativeHandle() const;
virtual const char* ImplementationName() const;
// Returns meta-data about the encoder, such as implementation name.
// The output of this method may change during runtime. For instance if a
// hardware encoder fails, it may fall back to doing software encoding using

4
modules/video_coding/include/video_codec_interface.h
View File

@ -75,12 +75,10 @@ union CodecSpecificInfoUnion {
// must be fitted with a copy-constructor. This is because it is copied
// in the copy-constructor of VCMEncodedFrame.
struct CodecSpecificInfo {
CodecSpecificInfo() : codecType(kVideoCodecGeneric), codec_name(nullptr) {
CodecSpecificInfo() : codecType(kVideoCodecGeneric) {
memset(&codecSpecific, 0, sizeof(codecSpecific));
}
VideoCodecType codecType;
// |codec_name| is deprecated, use name provided by VideoEncoder instead.
const char* codec_name;
CodecSpecificInfoUnion codecSpecific;
};