Remove ViEncoder::Pause / Start

webrtc/modules/video_coding/protection_bitrate_calculator.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
-#include <webrtc/modules/video_coding/protection_bitrate_calculator.h>
+#include "webrtc/modules/video_coding/protection_bitrate_calculator.h"
 
 namespace webrtc {
 
 using rtc::CritScope;
 
 struct ProtectionBitrateCalculator::EncodedFrameSample {
   EncodedFrameSample(size_t size_bytes,
                      uint32_t timestamp,
                      int64_t time_complete_ms)
       : size_bytes(size_bytes),
         timestamp(timestamp),
         time_complete_ms(time_complete_ms) {}
   size_t size_bytes;
   uint32_t timestamp;
   int64_t time_complete_ms;
 };
 
 ProtectionBitrateCalculator::ProtectionBitrateCalculator(
     Clock* clock,
     VCMProtectionCallback* protection_callback)
     : clock_(clock),
       protection_callback_(protection_callback),
       loss_prot_logic_(new media_optimization::VCMLossProtectionLogic(
           clock_->TimeInMilliseconds())),
-      max_payload_size_(1460) {}
+      max_payload_size_(1460),
+      last_encoder_target_rate_(0) {}
 
 ProtectionBitrateCalculator::~ProtectionBitrateCalculator(void) {
   loss_prot_logic_->Release();
 }
 
 void ProtectionBitrateCalculator::SetEncodingData(uint32_t target_bitrate,
                                                   uint16_t width,
                                                   uint16_t height,
                                                   uint32_t frame_rate,
                                                   size_t num_temporal_layers,
                                                   size_t max_payload_size) {
   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_->UpdateNumLayers(num_temporal_layers);
   max_payload_size_ = max_payload_size;
 }
 
 uint32_t ProtectionBitrateCalculator::SetTargetRates(

[pbos-webrtc, 2016/06/16 13:16:28]

This part of the code should be run synchronously (e.g. no concurrent
SetTargetRates), should we add a thread-checker or similar?

[perkj_webrtc, 2016/06/16 18:42:17]

I wish but not yet. If you have two VideoSendStreams they use two separate
threads to call into BitrateAllocator that will it turn call SetTargetRates....

     uint32_t estimated_bitrate_bps,
     int actual_framerate_fps,
     uint8_t fraction_lost,
     int64_t round_trip_time_ms) {
   float target_bitrate_kbps =
       static_cast<float>(estimated_bitrate_bps) / 1000.0f;
   // Sanity check.
   if (actual_framerate_fps < 1.0) {
     actual_framerate_fps = 1.0;
   }
@@ skipping 16 matching lines @@
     // Use max window filter for now.
     media_optimization::FilterPacketLossMode filter_mode =
         media_optimization::kMaxFilter;
     uint8_t packet_loss_enc = loss_prot_logic_->FilteredLoss(
         clock_->TimeInMilliseconds(), filter_mode, fraction_lost);
 
     // For now use the filtered loss for computing the robustness settings.
     loss_prot_logic_->UpdateFilteredLossPr(packet_loss_enc);
 
     if (loss_prot_logic_->SelectedType() == media_optimization::kNone) {
+      last_encoder_target_rate_ = estimated_bitrate_bps;
       return estimated_bitrate_bps;
     }
 
     // Update method will compute the robustness settings for the given
     // protection method and the overhead cost
     // the protection method is set by the user via SetVideoProtection.
     loss_prot_logic_->UpdateMethod();
 
     // Get the bit cost of protection method, based on the amount of
     // overhead data actually transmitted (including headers) the last
@@ skipping 41 matching lines @@
   if (sent_total_rate_bps > 0) {
     protection_overhead_rate =
         static_cast<float>(sent_nack_rate_bps + sent_fec_rate_bps) /
         sent_total_rate_bps;
   }
   // Cap the overhead estimate to 50%.
   if (protection_overhead_rate > 0.5)
     protection_overhead_rate = 0.5;
 
   // Source coding rate: total rate - protection overhead.
-  return estimated_bitrate_bps * (1.0 - protection_overhead_rate);
+  CritScope lock(&crit_sect_);
+  last_encoder_target_rate_ =
+      estimated_bitrate_bps * (1.0 - protection_overhead_rate);
+  return last_encoder_target_rate_;
+}
+
+uint32_t ProtectionBitrateCalculator::GetEncoderTargetRate() const {
+  CritScope lock(&crit_sect_);
+  return last_encoder_target_rate_;
 }
 
 void ProtectionBitrateCalculator::SetProtectionMethod(bool enable_fec,
                                                       bool enable_nack) {
   media_optimization::VCMProtectionMethodEnum method(media_optimization::kNone);
   if (enable_fec && enable_nack) {
     method = media_optimization::kNackFec;
   } else if (enable_nack) {
     method = media_optimization::kNack;
   } else if (enable_fec) {
@@ skipping 21 matching lines @@
             min_packets_per_frame, clock_->TimeInMilliseconds());
       }
     }
     if (!delta_frame && encoded_length > 0) {
       loss_prot_logic_->UpdateKeyFrameSize(static_cast<float>(encoded_length));
     }
   }
 }
 
 }  // namespace webrtc