fc8d26bd8a
This is a reland of 5897fe27abcbe70f706cc23adc26147e0581f97e. Adding back CallConfig::kDefaultStartBitrateBps as deprecated. Also making BitrateContraints::kDefaultStartBitrateBps private to stop it from being used in other places. Original change's description: > Moved BitrateConfig out of Call::Config. > > This prepares for a CL extracting the bitrate configuration logic from > the Call class. > > Also renaming BitrateConfig to BitrateConstraints. > > Bug: webrtc:8415 > Change-Id: I7e472683034c57bdc8093cdf5e78e477d1732480 > Reviewed-on: https://webrtc-review.googlesource.com/54400 > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22104} Bug: webrtc:8415 Change-Id: Iacfe2d6daedff710832ab89210c7c66d4403c93b Reviewed-on: https://webrtc-review.googlesource.com/55980 Commit-Queue: Sebastian Jansson <srte@webrtc.org> Reviewed-by: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22123}
56 lines
1.7 KiB
C++
56 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2018 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 CALL_BITRATE_CONSTRAINTS_H_
|
|
#define CALL_BITRATE_CONSTRAINTS_H_
|
|
|
|
#include <algorithm>
|
|
|
|
#include "api/optional.h"
|
|
|
|
namespace webrtc {
|
|
// TODO(srte): BitrateConstraints and BitrateConstraintsMask should be merged.
|
|
// Both represent the same kind data, but are using different default
|
|
// initializer and representation of unset values.
|
|
struct BitrateConstraints {
|
|
int min_bitrate_bps = 0;
|
|
int start_bitrate_bps = kDefaultStartBitrateBps;
|
|
int max_bitrate_bps = -1;
|
|
|
|
private:
|
|
static constexpr int kDefaultStartBitrateBps = 300000;
|
|
};
|
|
|
|
// BitrateConstraintsMask is used for the local client's bitrate preferences.
|
|
// Semantically it carries the same kind of information as BitrateConstraints,
|
|
// but is used in a slightly different way.
|
|
struct BitrateConstraintsMask {
|
|
BitrateConstraintsMask();
|
|
~BitrateConstraintsMask();
|
|
BitrateConstraintsMask(const BitrateConstraintsMask&);
|
|
rtc::Optional<int> min_bitrate_bps;
|
|
rtc::Optional<int> start_bitrate_bps;
|
|
rtc::Optional<int> max_bitrate_bps;
|
|
};
|
|
|
|
// Like std::min, but considers non-positive values to be unset.
|
|
template <typename T>
|
|
static T MinPositive(T a, T b) {
|
|
if (a <= 0) {
|
|
return b;
|
|
}
|
|
if (b <= 0) {
|
|
return a;
|
|
}
|
|
return std::min(a, b);
|
|
}
|
|
} // namespace webrtc
|
|
#endif // CALL_BITRATE_CONSTRAINTS_H_
|