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

Remove frame rate and target bitrate from ProtectionBitrateCalculator::SetEncodingData

Browse source 
These arguments are not really known when calling SetEncodingData. They are still provided as argument to ProtectionBitrateCalculator::SetTargetRates though.

This cl is broken out from https://codereview.webrtc.org/2060403002/
BUG=webrtc:5687

Review-Url: https://codereview.webrtc.org/2121983002
Cr-Commit-Position: refs/heads/master@{#13429}
This commit is contained in:
perkj 2016-07-11 01:47:32 -07:00 committed by Commit bot
parent 5e12d36ba7
commit c2c24f795e
6 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webrtc/modules/video_coding/media_opt_util.cc
View file

@ -599,7 +599,7 @@ void VCMLossProtectionLogic::UpdateKeyFrameSize(float keyFrameSize) {
_keyFrameSize = keyFrameSize; _keyFrameSize = keyFrameSize;
} }
void VCMLossProtectionLogic::UpdateFrameSize(uint16_t width, uint16_t height) { void VCMLossProtectionLogic::UpdateFrameSize(size_t width, size_t height) {
_codecWidth = width; _codecWidth = width;
_codecHeight = height; _codecHeight = height;
} }

6
webrtc/modules/video_coding/media_opt_util.h
View file

@ -282,7 +282,7 @@ class VCMLossProtectionLogic {
// Input: // Input:
// - width : The codec frame width. // - width : The codec frame width.
// - height : The codec frame height. // - height : The codec frame height.
void UpdateFrameSize(uint16_t width, uint16_t height); void UpdateFrameSize(size_t width, size_t height);
// Update the number of active layers // Update the number of active layers
// //
@ -350,8 +350,8 @@ class VCMLossProtectionLogic {
uint8_t _shortMaxLossPr255; uint8_t _shortMaxLossPr255;
rtc::ExpFilter _packetsPerFrame; rtc::ExpFilter _packetsPerFrame;
rtc::ExpFilter _packetsPerFrameKey; rtc::ExpFilter _packetsPerFrameKey;
uint16_t _codecWidth; size_t _codecWidth;
uint16_t _codecHeight; size_t _codecHeight;
int _numLayers; int _numLayers;
}; };

11
webrtc/modules/video_coding/protection_bitrate_calculator.cc
View file

@ -39,18 +39,11 @@ ProtectionBitrateCalculator::~ProtectionBitrateCalculator(void) {
loss_prot_logic_->Release(); loss_prot_logic_->Release();
} }
void ProtectionBitrateCalculator::SetEncodingData(uint32_t target_bitrate, void ProtectionBitrateCalculator::SetEncodingData(size_t width,
uint16_t width, size_t height,
uint16_t height,
uint32_t frame_rate,
size_t num_temporal_layers, size_t num_temporal_layers,
size_t max_payload_size) { size_t max_payload_size) {
CritScope lock(&crit_sect_); CritScope lock(&crit_sect_);
// Everything codec specific should be reset here since this means the codec
// has changed.
float target_bitrate_kbps = static_cast<float>(target_bitrate) / 1000.0f;
loss_prot_logic_->UpdateBitRate(target_bitrate_kbps);
loss_prot_logic_->UpdateFrameRate(static_cast<float>(frame_rate));
loss_prot_logic_->UpdateFrameSize(width, height); loss_prot_logic_->UpdateFrameSize(width, height);
loss_prot_logic_->UpdateNumLayers(num_temporal_layers); loss_prot_logic_->UpdateNumLayers(num_temporal_layers);
max_payload_size_ = max_payload_size; max_payload_size_ = max_payload_size;

6
webrtc/modules/video_coding/protection_bitrate_calculator.h
View file

@ -43,10 +43,8 @@ class ProtectionBitrateCalculator {
void SetProtectionMethod(bool enable_fec, bool enable_nack); void SetProtectionMethod(bool enable_fec, bool enable_nack);
// Informs media optimization of initial encoding state. // Informs media optimization of initial encoding state.
void SetEncodingData(uint32_t estimated_bitrate_bps, void SetEncodingData(size_t width,
uint16_t width, size_t height,
uint16_t height,
uint32_t frame_rate,
size_t num_temporal_layers, size_t num_temporal_layers,
size_t max_payload_size); size_t max_payload_size);

6
webrtc/modules/video_coding/protection_bitrate_calculator_unittest.cc
View file

@ -53,7 +53,7 @@ TEST_F(ProtectionBitrateCalculatorTest, ProtectsUsingFecBitrate) {
static const uint32_t kMaxBitrateBps = 130000; static const uint32_t kMaxBitrateBps = 130000;
media_opt_.SetProtectionMethod(true /*enable_fec*/, false /* enable_nack */); media_opt_.SetProtectionMethod(true /*enable_fec*/, false /* enable_nack */);
media_opt_.SetEncodingData(kCodecBitrateBps, 640, 480, 30, 1, 1000); media_opt_.SetEncodingData(640, 480, 1, 1000);
// Using 10% of codec bitrate for FEC. // Using 10% of codec bitrate for FEC.
protection_callback_.fec_rate_bps_ = kCodecBitrateBps / 10; protection_callback_.fec_rate_bps_ = kCodecBitrateBps / 10;
@ -73,7 +73,7 @@ TEST_F(ProtectionBitrateCalculatorTest, ProtectsUsingNackBitrate) {
static const uint32_t kMaxBitrateBps = 130000; static const uint32_t kMaxBitrateBps = 130000;
media_opt_.SetProtectionMethod(false /*enable_fec*/, true /* enable_nack */); media_opt_.SetProtectionMethod(false /*enable_fec*/, true /* enable_nack */);
media_opt_.SetEncodingData(kCodecBitrateBps, 640, 480, 30, 1, 1000); media_opt_.SetEncodingData(640, 480, 1, 1000);
uint32_t target_bitrate = media_opt_.SetTargetRates(kMaxBitrateBps, 30, 0, 0); uint32_t target_bitrate = media_opt_.SetTargetRates(kMaxBitrateBps, 30, 0, 0);
@ -90,7 +90,7 @@ TEST_F(ProtectionBitrateCalculatorTest, NoProtection) {
static const uint32_t kMaxBitrateBps = 130000; static const uint32_t kMaxBitrateBps = 130000;
media_opt_.SetProtectionMethod(false /*enable_fec*/, false /* enable_nack */); media_opt_.SetProtectionMethod(false /*enable_fec*/, false /* enable_nack */);
media_opt_.SetEncodingData(kCodecBitrateBps, 640, 480, 30, 1, 1000); media_opt_.SetEncodingData(640, 480, 1, 1000);
uint32_t target_bitrate = uint32_t target_bitrate =
media_opt_.SetTargetRates(kMaxBitrateBps, 30, 128, 100); media_opt_.SetTargetRates(kMaxBitrateBps, 30, 128, 100);

2
webrtc/video/video_send_stream.cc
View file

@ -617,10 +617,8 @@ void VideoSendStream::EncoderProcess() {
.temporal_layer_thresholds_bps.size() + .temporal_layer_thresholds_bps.size() +
1; 1;
protection_bitrate_calculator_.SetEncodingData( protection_bitrate_calculator_.SetEncodingData(
current_encoder_settings_->video_codec.startBitrate * 1000,
current_encoder_settings_->video_codec.width, current_encoder_settings_->video_codec.width,
current_encoder_settings_->video_codec.height, current_encoder_settings_->video_codec.height,
current_encoder_settings_->video_codec.maxFramerate,
number_of_temporal_layers, payload_router_.MaxPayloadLength()); number_of_temporal_layers, payload_router_.MaxPayloadLength());
// We might've gotten new settings while configuring the encoder settings, // We might've gotten new settings while configuring the encoder settings,