6f440ed5b5
This reverts commit 07efe436c9002e139845f62486e3ee4e29f0d85b. Reason for revert: Breaks downstream project. cricket::GetSimulcastConfig method signature has been updated. I think you can get away with a default value for temporal_layers_supported (and then you can remove it after a few days when projects will be updated). Original change's description: > Implement H264 simulcast support and generalize SimulcastEncoderAdapter use for H264 & VP8. > > * Move SimulcastEncoderAdapter out under modules/video_coding > * Move SimulcastRateAllocator back out to modules/video_coding/utility > * Move TemporalLayers and ScreenshareLayers to modules/video_coding/utility > * Move any VP8 specific code - such as temporal layer bitrate budgeting - > under codec type dependent conditionals. > * Plumb the simulcast index for H264 in the codec specific and RTP format data structures. > > Bug: webrtc:5840 > Change-Id: Ieced8a00e38f273c1a6cfd0f5431a87d07b8f44e > Reviewed-on: https://webrtc-review.googlesource.com/64100 > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23705} TBR=sprang@webrtc.org,stefan@webrtc.org,mflodman@webrtc.org,hta@webrtc.org,sergio.garcia.murillo@gmail.com,titovartem@webrtc.org,agouaillard@gmail.com Change-Id: Ic9d3b1eeaf195bb5ec2063954421f5e77866d663 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:5840 Reviewed-on: https://webrtc-review.googlesource.com/84760 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23710}
122 lines
3.8 KiB
C++
122 lines
3.8 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 MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_
|
|
#define MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "modules/video_coding/codecs/vp8/temporal_layers.h"
|
|
#include "modules/video_coding/utility/frame_dropper.h"
|
|
#include "rtc_base/rate_statistics.h"
|
|
#include "rtc_base/timeutils.h"
|
|
#include "typedefs.h" // NOLINT(build/include)
|
|
|
|
namespace webrtc {
|
|
|
|
struct CodecSpecificInfoVP8;
|
|
class Clock;
|
|
|
|
class ScreenshareLayers : public TemporalLayers {
|
|
public:
|
|
static const double kMaxTL0FpsReduction;
|
|
static const double kAcceptableTargetOvershoot;
|
|
static const int kMaxFrameIntervalMs;
|
|
|
|
ScreenshareLayers(int num_temporal_layers, Clock* clock);
|
|
virtual ~ScreenshareLayers();
|
|
|
|
// Returns the recommended VP8 encode flags needed. May refresh the decoder
|
|
// and/or update the reference buffers.
|
|
TemporalLayers::FrameConfig UpdateLayerConfig(uint32_t timestamp) override;
|
|
|
|
// New target bitrate, per temporal layer.
|
|
void OnRatesUpdated(const std::vector<uint32_t>& bitrates_bps,
|
|
int framerate_fps) override;
|
|
|
|
// Update the encoder configuration with target bitrates or other parameters.
|
|
// Returns true iff the configuration was actually modified.
|
|
bool UpdateConfiguration(Vp8EncoderConfig* cfg) override;
|
|
|
|
void PopulateCodecSpecific(bool base_layer_sync,
|
|
const TemporalLayers::FrameConfig& tl_config,
|
|
CodecSpecificInfoVP8* vp8_info,
|
|
uint32_t timestamp) override;
|
|
|
|
void FrameEncoded(unsigned int size, int qp) override;
|
|
|
|
private:
|
|
enum class TemporalLayerState : int { kDrop, kTl0, kTl1, kTl1Sync };
|
|
|
|
bool TimeToSync(int64_t timestamp) const;
|
|
uint32_t GetCodecTargetBitrateKbps() const;
|
|
|
|
Clock* const clock_;
|
|
|
|
int number_of_temporal_layers_;
|
|
bool last_base_layer_sync_;
|
|
int active_layer_;
|
|
int64_t last_timestamp_;
|
|
int64_t last_sync_timestamp_;
|
|
int64_t last_emitted_tl0_timestamp_;
|
|
int64_t last_frame_time_ms_;
|
|
rtc::TimestampWrapAroundHandler time_wrap_handler_;
|
|
int min_qp_;
|
|
int max_qp_;
|
|
uint32_t max_debt_bytes_;
|
|
|
|
// Configured max framerate.
|
|
absl::optional<uint32_t> target_framerate_;
|
|
// Incoming framerate from capturer.
|
|
absl::optional<uint32_t> capture_framerate_;
|
|
// Tracks what framerate we actually encode, and drops frames on overshoot.
|
|
RateStatistics encode_framerate_;
|
|
bool bitrate_updated_;
|
|
|
|
static constexpr 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 // MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_
|