This reverts commit 76d3e7a8d1539483a8465d6502cc8259e74ccebf. Reason for revert: Causes multiple Chromium WPT tests to crash, preventing rolls. Sample failed run: https://ci.chromium.org/p/chromium/builders/try/win10_chromium_x64_rel_ng/685757? Sample stack trace: #0 0x7ff8623fbde9 base::debug::CollectStackTrace() STDERR: #1 0x7ff862311ca3 [2665012:17:1009/162250.249660:WARNING:timestamp_aligner.cc(131)] too short translated timestamp interval: system time (us) = 3042652370324, interval (us) = 834 STDERR: base::debug::StackTrace::StackTrace() STDERR: #2 0x7ff8623fb93b base::debug::(anonymous namespace)::StackDumpSignalHandler() STDERR: #3 0x7ff857a70140 [2665012:17:1009/162250.249947:WARNING:timestamp_aligner.cc(131)] too short translated timestamp interval: system time (us) = 3042652370634, interval (us) = 742 STDERR: (/lib/x86_64-linux-gnu/libpthread-2.31.so+0x1413f) STDERR: #4 0x7ff85778edb1 gsignal STDERR: #5 0x7ff857778537 abort STDERR: #6 0x7ff855d5eee2 [2665012:17:1009/162250.250342:WARNING:timestamp_aligner.cc(131)] too short translated timestamp interval: system time (us) = 3042652371030, interval (us) = 706 STDERR: [2665012:17:1009/162250.250514:WARNING:timestamp_aligner.cc(131)] too short translated timestamp interval: system time (us) = 3042652371204, interval (us) = 963 STDERR: rtc::webrtc_checks_impl::FatalLog() STDERR: #7 0x7ff855f14e62 webrtc::LibvpxVp8Encoder::PrepareRawImagesForEncoding() STDERR: #8 0x7ff855f14412 webrtc::LibvpxVp8Encoder::Encode() STDERR: #9 0x7ff855bae765 webrtc::SimulcastEncoderAdapter::Encode() STDERR: #10 0x7ff85607d598 webrtc::VideoStreamEncoder::EncodeVideoFrame() STDERR: #11 0x7ff85607c60d webrtc::VideoStreamEncoder::MaybeEncodeVideoFrame() STDERR: #12 0x7ff8560816f5 webrtc::webrtc_new_closure_impl::ClosureTask<>::Run() STDERR: #13 0x7ff855b352b5 (anonymous namespace)::WebrtcTaskQueue::RunTask() STDERR: #14 0x7ff855b3531e base::internal::Invoker<>::RunOnce() STDERR: #15 0x7ff86239785b base::TaskAnnotator::RunTask() STDERR: #16 0x7ff8623c8557 base::internal::TaskTracker::RunSkipOnShutdown() STDERR: #17 0x7ff8623c7d92 base::internal::TaskTracker::RunTask() STDERR: #18 0x7ff862415a06 base::internal::TaskTrackerPosix::RunTask() STDERR: #19 0x7ff8623c75e6 base::internal::TaskTracker::RunAndPopNextTask() STDERR: #20 0x7ff8623d3a8d base::internal::WorkerThread::RunWorker() STDERR: #21 0x7ff8623d368d base::internal::WorkerThread::RunPooledWorker() STDERR: #22 0x7ff862416509 base::(anonymous namespace)::ThreadFunc() STDERR: #23 0x7ff857a64ea7 start_thread Original change's description: > NV12 support for VP8 simulcast > > Tested using video_loopback with generated NV12 frames. > > Bug: webrtc:11635, webrtc:11975 > Change-Id: I14b2d663c55a83d80e48e226fcf706cb18903193 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/186722 > Commit-Queue: Evan Shrubsole <eshr@google.com> > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32325} TBR=ilnik@webrtc.org,eshr@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:11635 Bug: webrtc:11975 Change-Id: I61c8aed1270bc9c2f7f0577fa5ca717a325f548a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187484 Reviewed-by: Guido Urdaneta <guidou@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Guido Urdaneta <guidou@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32369}
150 lines
5.3 KiB
C++
150 lines
5.3 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef MODULES_VIDEO_CODING_CODECS_VP8_LIBVPX_VP8_ENCODER_H_
|
|
#define MODULES_VIDEO_CODING_CODECS_VP8_LIBVPX_VP8_ENCODER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/fec_controller_override.h"
|
|
#include "api/video/encoded_image.h"
|
|
#include "api/video/video_frame.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "api/video_codecs/vp8_frame_buffer_controller.h"
|
|
#include "api/video_codecs/vp8_frame_config.h"
|
|
#include "modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "modules/video_coding/codecs/vp8/libvpx_interface.h"
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
|
#include "modules/video_coding/utility/framerate_controller.h"
|
|
#include "rtc_base/experiments/cpu_speed_experiment.h"
|
|
#include "rtc_base/experiments/rate_control_settings.h"
|
|
#include "vpx/vp8cx.h"
|
|
#include "vpx/vpx_encoder.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class LibvpxVp8Encoder : public VideoEncoder {
|
|
public:
|
|
LibvpxVp8Encoder(std::unique_ptr<LibvpxInterface> interface,
|
|
VP8Encoder::Settings settings);
|
|
~LibvpxVp8Encoder() override;
|
|
|
|
int Release() override;
|
|
|
|
void SetFecControllerOverride(
|
|
FecControllerOverride* fec_controller_override) override;
|
|
|
|
int InitEncode(const VideoCodec* codec_settings,
|
|
const VideoEncoder::Settings& settings) override;
|
|
|
|
int Encode(const VideoFrame& input_image,
|
|
const std::vector<VideoFrameType>* frame_types) override;
|
|
|
|
int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;
|
|
|
|
void SetRates(const RateControlParameters& parameters) override;
|
|
|
|
void OnPacketLossRateUpdate(float packet_loss_rate) override;
|
|
|
|
void OnRttUpdate(int64_t rtt_ms) override;
|
|
|
|
void OnLossNotification(const LossNotification& loss_notification) override;
|
|
|
|
EncoderInfo GetEncoderInfo() const override;
|
|
|
|
static vpx_enc_frame_flags_t EncodeFlags(const Vp8FrameConfig& references);
|
|
|
|
private:
|
|
// Get the cpu_speed setting for encoder based on resolution and/or platform.
|
|
int GetCpuSpeed(int width, int height);
|
|
|
|
// Determine number of encoder threads to use.
|
|
int NumberOfThreads(int width, int height, int number_of_cores);
|
|
|
|
// Call encoder initialize function and set control settings.
|
|
int InitAndSetControlSettings();
|
|
|
|
void PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
|
|
const vpx_codec_cx_pkt& pkt,
|
|
int stream_idx,
|
|
int encoder_idx,
|
|
uint32_t timestamp);
|
|
|
|
int GetEncodedPartitions(const VideoFrame& input_image,
|
|
bool retransmission_allowed);
|
|
|
|
// Set the stream state for stream |stream_idx|.
|
|
void SetStreamState(bool send_stream, int stream_idx);
|
|
|
|
uint32_t MaxIntraTarget(uint32_t optimal_buffer_size);
|
|
|
|
uint32_t FrameDropThreshold(size_t spatial_idx) const;
|
|
|
|
size_t SteadyStateSize(int sid, int tid);
|
|
|
|
bool UpdateVpxConfiguration(size_t stream_index);
|
|
|
|
const std::unique_ptr<LibvpxInterface> libvpx_;
|
|
|
|
const CpuSpeedExperiment experimental_cpu_speed_config_arm_;
|
|
const RateControlSettings rate_control_settings_;
|
|
|
|
// EncoderInfo::requested_resolution_alignment override from field trial.
|
|
const absl::optional<int> requested_resolution_alignment_override_;
|
|
|
|
EncodedImageCallback* encoded_complete_callback_ = nullptr;
|
|
VideoCodec codec_;
|
|
bool inited_ = false;
|
|
int64_t timestamp_ = 0;
|
|
int qp_max_ = 56;
|
|
int cpu_speed_default_ = -6;
|
|
int number_of_cores_ = 0;
|
|
uint32_t rc_max_intra_target_ = 0;
|
|
int num_active_streams_ = 0;
|
|
const std::unique_ptr<Vp8FrameBufferControllerFactory>
|
|
frame_buffer_controller_factory_;
|
|
std::unique_ptr<Vp8FrameBufferController> frame_buffer_controller_;
|
|
const std::vector<VideoEncoder::ResolutionBitrateLimits>
|
|
resolution_bitrate_limits_;
|
|
std::vector<bool> key_frame_request_;
|
|
std::vector<bool> send_stream_;
|
|
std::vector<int> cpu_speed_;
|
|
std::vector<vpx_image_t> raw_images_;
|
|
std::vector<EncodedImage> encoded_images_;
|
|
std::vector<vpx_codec_ctx_t> encoders_;
|
|
std::vector<vpx_codec_enc_cfg_t> vpx_configs_;
|
|
std::vector<Vp8EncoderConfig> config_overrides_;
|
|
std::vector<vpx_rational_t> downsampling_factors_;
|
|
|
|
// Variable frame-rate screencast related fields and methods.
|
|
const struct VariableFramerateExperiment {
|
|
bool enabled = false;
|
|
// Framerate is limited to this value in steady state.
|
|
float framerate_limit = 5.0;
|
|
// This qp or below is considered a steady state.
|
|
int steady_state_qp = 15;
|
|
// Frames of at least this percentage below ideal for configured bitrate are
|
|
// considered in a steady state.
|
|
int steady_state_undershoot_percentage = 30;
|
|
} variable_framerate_experiment_;
|
|
static VariableFramerateExperiment ParseVariableFramerateConfig(
|
|
std::string group_name);
|
|
FramerateController framerate_controller_;
|
|
int num_steady_state_frames_ = 0;
|
|
|
|
FecControllerOverride* fec_controller_override_ = nullptr;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_CODECS_VP8_LIBVPX_VP8_ENCODER_H_
|