mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-16 15:20:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Delete support for custom VP8 frame buffer controller as unused

Browse source 
Bug: None
Change-Id: Ie7970eeb25f87cd0621aab0c076867a9d631fb06
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/346500
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42047}
This commit is contained in:
Danil Chapovalov 2024-04-09 15:01:13 +02:00 committed by WebRTC LUCI CQ
parent 41b4bf97c1
commit 79b9c7e889
3 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/video_coding/codecs/vp8/include/vp8.h
View file

@ -17,18 +17,11 @@
#include "absl/base/nullability.h" #include "absl/base/nullability.h"
#include "api/environment/environment.h" #include "api/environment/environment.h"
#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/vp8_frame_buffer_controller.h"
#include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_codec_interface.h"
namespace webrtc { namespace webrtc {
struct Vp8EncoderSettings { struct Vp8EncoderSettings {
// Allows for overriding the Vp8FrameBufferController used by the encoder.
// If unset, a default Vp8FrameBufferController will be instantiated
// internally.
absl::Nullable<std::unique_ptr<Vp8FrameBufferControllerFactory>>
frame_buffer_controller_factory;
// Allows for overriding the resolution/bitrate limits exposed through // Allows for overriding the resolution/bitrate limits exposed through
// VideoEncoder::GetEncoderInfo(). No override is done if empty. // VideoEncoder::GetEncoderInfo(). No override is done if empty.
std::vector<VideoEncoder::ResolutionBitrateLimits> resolution_bitrate_limits; std::vector<VideoEncoder::ResolutionBitrateLimits> resolution_bitrate_limits;

13
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
View file

@ -314,8 +314,6 @@ LibvpxVp8Encoder::LibvpxVp8Encoder(std::unique_ptr<LibvpxInterface> interface,
VP8Encoder::Settings settings) VP8Encoder::Settings settings)
: libvpx_(std::move(interface)), : libvpx_(std::move(interface)),
rate_control_settings_(RateControlSettings::ParseFromFieldTrials()), rate_control_settings_(RateControlSettings::ParseFromFieldTrials()),
frame_buffer_controller_factory_(
std::move(settings.frame_buffer_controller_factory)),
resolution_bitrate_limits_(std::move(settings.resolution_bitrate_limits)), resolution_bitrate_limits_(std::move(settings.resolution_bitrate_limits)),
key_frame_request_(kMaxSimulcastStreams, false), key_frame_request_(kMaxSimulcastStreams, false),
last_encoder_output_time_(kMaxSimulcastStreams, last_encoder_output_time_(kMaxSimulcastStreams,
@ -537,14 +535,9 @@ int LibvpxVp8Encoder::InitEncode(const VideoCodec* inst,
} }
RTC_DCHECK(!frame_buffer_controller_); RTC_DCHECK(!frame_buffer_controller_);
if (frame_buffer_controller_factory_) { Vp8TemporalLayersFactory factory;
frame_buffer_controller_ = frame_buffer_controller_factory_->Create( frame_buffer_controller_ =
*inst, settings, fec_controller_override_); factory.Create(*inst, settings, fec_controller_override_);
} else {
Vp8TemporalLayersFactory factory;
frame_buffer_controller_ =
factory.Create(*inst, settings, fec_controller_override_);
}
RTC_DCHECK(frame_buffer_controller_); RTC_DCHECK(frame_buffer_controller_);
number_of_cores_ = settings.number_of_cores; number_of_cores_ = settings.number_of_cores;

2
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
View file

@ -129,8 +129,6 @@ class LibvpxVp8Encoder : public VideoEncoder {
int number_of_cores_ = 0; int number_of_cores_ = 0;
uint32_t rc_max_intra_target_ = 0; uint32_t rc_max_intra_target_ = 0;
int num_active_streams_ = 0; int num_active_streams_ = 0;
const std::unique_ptr<Vp8FrameBufferControllerFactory>
frame_buffer_controller_factory_;
std::unique_ptr<Vp8FrameBufferController> frame_buffer_controller_; std::unique_ptr<Vp8FrameBufferController> frame_buffer_controller_;
const std::vector<VideoEncoder::ResolutionBitrateLimits> const std::vector<VideoEncoder::ResolutionBitrateLimits>
resolution_bitrate_limits_; resolution_bitrate_limits_;