1369c83b42
Reason for revert: Seems to be causing flakiness in perf test: FullStackTest.ScreenshareSlidesVP8_2TL_LossyNet Original issue's description: > Reland of Issue 2434073003: Extract bitrate allocation ... > > This is a reland of https://codereview.webrtc.org/2434073003/ including > some fixes for failing test cases. > > Original description: > > Extract bitrate allocation of spatial/temporal layers out of codec impl. > > This CL makes a number of intervowen changes: > > * Add BitrateAllocation struct, that contains a codec independent view > of how the target bitrate is distributed over spatial and temporal > layers. > > * Adds the BitrateAllocator interface, which takes a bitrate and frame > rate and produces a BitrateAllocation. > > * A default (non layered) implementation is added, and > SimulcastRateAllocator is extended to fully handle VP8 allocation. > This includes capturing TemporalLayer instances created by the > encoder. > > * ViEEncoder now owns both the bitrate allocator and the temporal layer > factories for VP8. This allows allocation to happen fully outside of > the encoder implementation. > > This refactoring will make it possible for ViEEncoder to signal the > full picture of target bitrates to the RTCP module. > > BUG=webrtc:6301 > > Committed: https://crrev.com/647bf43dcb2fd16fccf276bd94dc4400728bb405 > Cr-Commit-Position: refs/heads/master@{#15023} TBR=mflodman@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6301 Review-Url: https://codereview.webrtc.org/2491393002 Cr-Commit-Position: refs/heads/master@{#15026}
121 lines
3.6 KiB
C++
121 lines
3.6 KiB
C++
/* Copyright (c) 2013 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 WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_
|
|
|
|
#include <list>
|
|
|
|
#include "vpx/vpx_encoder.h"
|
|
|
|
#include "webrtc/base/timeutils.h"
|
|
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
|
|
#include "webrtc/modules/video_coding/utility/frame_dropper.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
struct CodecSpecificInfoVP8;
|
|
class Clock;
|
|
|
|
class ScreenshareLayers : public TemporalLayers {
|
|
public:
|
|
static const double kMaxTL0FpsReduction;
|
|
static const double kAcceptableTargetOvershoot;
|
|
static const int kTl0Flags;
|
|
static const int kTl1Flags;
|
|
static const int kTl1SyncFlags;
|
|
static const int kMaxFrameIntervalMs;
|
|
|
|
ScreenshareLayers(int num_temporal_layers,
|
|
uint8_t initial_tl0_pic_idx,
|
|
Clock* clock);
|
|
virtual ~ScreenshareLayers();
|
|
|
|
// Returns the recommended VP8 encode flags needed. May refresh the decoder
|
|
// and/or update the reference buffers.
|
|
int EncodeFlags(uint32_t timestamp) override;
|
|
|
|
bool ConfigureBitrates(int bitrate_kbps,
|
|
int max_bitrate_kbps,
|
|
int framerate,
|
|
vpx_codec_enc_cfg_t* cfg) override;
|
|
|
|
void PopulateCodecSpecific(bool base_layer_sync,
|
|
CodecSpecificInfoVP8* vp8_info,
|
|
uint32_t timestamp) override;
|
|
|
|
void FrameEncoded(unsigned int size, uint32_t timestamp, int qp) override;
|
|
|
|
int CurrentLayerId() const override;
|
|
|
|
// Allows the layers adapter to update the encoder configuration prior to a
|
|
// frame being encoded. Return true if the configuration should be updated
|
|
// and false if now change is needed.
|
|
bool UpdateConfiguration(vpx_codec_enc_cfg_t* cfg) override;
|
|
|
|
private:
|
|
bool TimeToSync(int64_t timestamp) const;
|
|
|
|
Clock* const clock_;
|
|
|
|
int number_of_temporal_layers_;
|
|
bool last_base_layer_sync_;
|
|
uint8_t tl0_pic_idx_;
|
|
int active_layer_;
|
|
int64_t last_timestamp_;
|
|
int64_t last_sync_timestamp_;
|
|
int64_t last_emitted_tl0_timestamp_;
|
|
rtc::TimestampWrapAroundHandler time_wrap_handler_;
|
|
int min_qp_;
|
|
int max_qp_;
|
|
uint32_t max_debt_bytes_;
|
|
int frame_rate_;
|
|
|
|
static const int kMaxNumTemporalLayers = 2;
|
|
struct TemporalLayer {
|
|
TemporalLayer()
|
|
: state(State::kNormal),
|
|
enhanced_max_qp(-1),
|
|
last_qp(-1),
|
|
debt_bytes_(0),
|
|
target_rate_kbps_(0) {}
|
|
|
|
enum class State {
|
|
kNormal,
|
|
kDropped,
|
|
kReencoded,
|
|
kQualityBoost,
|
|
} state;
|
|
|
|
int enhanced_max_qp;
|
|
int last_qp;
|
|
uint32_t debt_bytes_;
|
|
uint32_t target_rate_kbps_;
|
|
|
|
void UpdateDebt(int64_t delta_ms);
|
|
} layers_[kMaxNumTemporalLayers];
|
|
|
|
void UpdateHistograms();
|
|
// Data for histogram statistics.
|
|
struct Stats {
|
|
int64_t first_frame_time_ms_ = -1;
|
|
int64_t num_tl0_frames_ = 0;
|
|
int64_t num_tl1_frames_ = 0;
|
|
int64_t num_dropped_frames_ = 0;
|
|
int64_t num_overshoots_ = 0;
|
|
int64_t tl0_qp_sum_ = 0;
|
|
int64_t tl1_qp_sum_ = 0;
|
|
int64_t tl0_target_bitrate_sum_ = 0;
|
|
int64_t tl1_target_bitrate_sum_ = 0;
|
|
} stats_;
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_
|