mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 07:37:51 +01:00

This reverts commit718d8631b0
. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Revert "Add ProtectionBitrateCalculator as an abstract class. ProtectionBitrateCalculatorDefault implements ProtectionBitrateCalculator. Register VideoSendStream to packet feedback"" > > This reverts commit53d901332c
. > > Reason for revert: root cause has been found and will be addressed in the patch.The root cause was protection_bitrate_calculator_ is now destructed before worker_queue_, and worker_queue_ may contain tasks which involves protection_bitrate_calculator_, so they need to be destructed in the opposite order. > That was not an issue since before this cl we didn't allocate protection_bitrate_calculator_ on the heap. > > Original change's description: > > Revert "Add ProtectionBitrateCalculator as an abstract class. ProtectionBitrateCalculatorDefault implements ProtectionBitrateCalculator. Register VideoSendStream to packet feedback" > > > > This reverts commite58e91b6d1
. > > > > Reason for revert: Breaks downstream project b/70848177 > > > > Original change's description: > > > Add ProtectionBitrateCalculator as an abstract class. ProtectionBitrateCalculatorDefault implements ProtectionBitrateCalculator. Register VideoSendStream to packet feedback > > > > > > Bug: webrtc:8656 > > > Change-Id: Iab4f6ab8997cb082762218afc8580e9985ac2522 > > > Reviewed-on: https://webrtc-review.googlesource.com/33010 > > > Commit-Queue: Ying Wang <yinwa@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21348} > > > > TBR=stefan@webrtc.org,philipel@webrtc.org,yinwa@webrtc.org > > > > Change-Id: Ic186ba78be429bd1046ceac15051a3382b6ffc4f > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:8656 > > Reviewed-on: https://webrtc-review.googlesource.com/35080 > > Commit-Queue: Lu Liu <lliuu@webrtc.org> > > Reviewed-by: Lu Liu <lliuu@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21374} > > TBR=stefan@webrtc.org,philipel@webrtc.org,lliuu@webrtc.org,yujo@chromium.org,yinwa@webrtc.org > > Change-Id: Ie2b5a2a2ead0f20ac67c1ea9b8d192af66bddf8d > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8656 > Reviewed-on: https://webrtc-review.googlesource.com/35320 > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Ying Wang <yinwa@webrtc.org> > Commit-Queue: Ying Wang <yinwa@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#21409} TBR=stefan@webrtc.org,philipel@webrtc.org,lliuu@webrtc.org,yujo@chromium.org,yinwa@webrtc.org Change-Id: I9773aaa942054dcfbab6002a5d713ab3526b0534 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8656 Reviewed-on: https://webrtc-review.googlesource.com/35700 Reviewed-by: Ying Wang <yinwa@webrtc.org> Commit-Queue: Ying Wang <yinwa@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21410}
78 lines
3.1 KiB
C++
78 lines
3.1 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_
|
|
#define MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_
|
|
|
|
#include <list>
|
|
#include <memory>
|
|
|
|
#include "modules/include/module_common_types.h"
|
|
#include "modules/video_coding/include/video_coding.h"
|
|
#include "modules/video_coding/media_opt_util.h"
|
|
#include "rtc_base/criticalsection.h"
|
|
#include "system_wrappers/include/clock.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// ProtectionBitrateCalculator calculates how much of the allocated network
|
|
// capacity that can be used by an encoder and how much that
|
|
// is needed for redundant packets such as FEC and NACK. It uses an
|
|
// implementation of |VCMProtectionCallback| to set new FEC parameters and get
|
|
// the bitrate currently used for FEC and NACK.
|
|
// Usage:
|
|
// Setup by calling SetProtectionMethod and SetEncodingData.
|
|
// For each encoded image, call UpdateWithEncodedData.
|
|
// Each time the bandwidth estimate change, call SetTargetRates. SetTargetRates
|
|
// will return the bitrate that can be used by an encoder.
|
|
// A lock is used to protect internal states, so methods can be called on an
|
|
// arbitrary thread.
|
|
class ProtectionBitrateCalculator {
|
|
public:
|
|
ProtectionBitrateCalculator(Clock* clock,
|
|
VCMProtectionCallback* protection_callback);
|
|
~ProtectionBitrateCalculator();
|
|
|
|
void SetProtectionMethod(bool enable_fec, bool enable_nack);
|
|
|
|
// Informs media optimization of initial encoding state.
|
|
void SetEncodingData(size_t width,
|
|
size_t height,
|
|
size_t num_temporal_layers,
|
|
size_t max_payload_size);
|
|
|
|
// Returns target rate for the encoder given the channel parameters.
|
|
// Inputs: estimated_bitrate_bps - the estimated network bitrate in bits/s.
|
|
// actual_framerate - encoder frame rate.
|
|
// fraction_lost - packet loss rate in % in the network.
|
|
// round_trip_time_ms - round trip time in milliseconds.
|
|
uint32_t SetTargetRates(uint32_t estimated_bitrate_bps,
|
|
int actual_framerate,
|
|
uint8_t fraction_lost,
|
|
int64_t round_trip_time_ms);
|
|
// Informs of encoded output.
|
|
void UpdateWithEncodedData(const EncodedImage& encoded_image);
|
|
|
|
private:
|
|
enum { kBitrateAverageWinMs = 1000 };
|
|
|
|
Clock* const clock_;
|
|
VCMProtectionCallback* const protection_callback_;
|
|
|
|
rtc::CriticalSection crit_sect_;
|
|
std::unique_ptr<media_optimization::VCMLossProtectionLogic> loss_prot_logic_
|
|
RTC_GUARDED_BY(crit_sect_);
|
|
size_t max_payload_size_ RTC_GUARDED_BY(crit_sect_);
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(ProtectionBitrateCalculator);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_
|