8c1bf9595a
This reverts commit 948b7e37557af68b3bc9b81b29ae2daffb2784ad. Reason for revert: downstream project fixed. Original change's description: > Revert "Add initial support for RtpEncodingParameters max_framerate." > > This reverts commit ced5cfdb35a20c684df927eab37e16d35979555f. > > Reason for revert: Breaks downstream project. > > Original change's description: > > Add initial support for RtpEncodingParameters max_framerate. > > > > Add support to set the framerate to the maximum of |max_framerate|. > > Different framerates are currently not supported per stream for video. > > > > Bug: webrtc:9597 > > Change-Id: Ie326617b66bd97be387f809a7f82b97b8f3ff5fe > > Reviewed-on: https://webrtc-review.googlesource.com/92392 > > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Commit-Queue: Åsa Persson <asapersson@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#24270} > > TBR=steveanton@webrtc.org,magjed@webrtc.org,asapersson@webrtc.org,sprang@webrtc.org,srte@webrtc.org > > Change-Id: I508fe48e0c53996654f657357913ac307dc256bd > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9597 > Reviewed-on: https://webrtc-review.googlesource.com/94060 > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#24277} TBR=steveanton@webrtc.org,mbonadei@webrtc.org,magjed@webrtc.org,asapersson@webrtc.org,sprang@webrtc.org,srte@webrtc.org Bug: webrtc:9597 Change-Id: Ieed9d62787f3e9dcb439399bfe7529012292381e Reviewed-on: https://webrtc-review.googlesource.com/100080 Reviewed-by: Åsa Persson <asapersson@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24720}
65 lines
2.0 KiB
C++
65 lines
2.0 KiB
C++
/*
|
|
* Copyright (c) 2014 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 MEDIA_ENGINE_SIMULCAST_H_
|
|
#define MEDIA_ENGINE_SIMULCAST_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "api/video_codecs/video_encoder_config.h"
|
|
|
|
namespace cricket {
|
|
|
|
// Gets the total maximum bitrate for the |streams|.
|
|
int GetTotalMaxBitrateBps(const std::vector<webrtc::VideoStream>& streams);
|
|
|
|
// Adds any bitrate of |max_bitrate_bps| that is above the total maximum bitrate
|
|
// for the |layers| to the highest quality layer.
|
|
void BoostMaxSimulcastLayer(int max_bitrate_bps,
|
|
std::vector<webrtc::VideoStream>* layers);
|
|
|
|
// Gets simulcast settings.
|
|
// TODO(asapersson): Remove max_bitrate_bps and max_framerate.
|
|
std::vector<webrtc::VideoStream> GetSimulcastConfig(
|
|
size_t max_layers,
|
|
int width,
|
|
int height,
|
|
int /*max_bitrate_bps*/,
|
|
double bitrate_priority,
|
|
int max_qp,
|
|
int /*max_framerate*/,
|
|
bool is_screenshare,
|
|
bool temporal_layers_supported = true);
|
|
|
|
// Gets the simulcast config layers for a non-screensharing case.
|
|
std::vector<webrtc::VideoStream> GetNormalSimulcastLayers(
|
|
size_t max_layers,
|
|
int width,
|
|
int height,
|
|
double bitrate_priority,
|
|
int max_qp,
|
|
bool temporal_layers_supported = true);
|
|
|
|
// Gets simulcast config layers for screenshare settings.
|
|
std::vector<webrtc::VideoStream> GetScreenshareLayers(
|
|
size_t max_layers,
|
|
int width,
|
|
int height,
|
|
double bitrate_priority,
|
|
int max_qp,
|
|
bool screenshare_simulcast_enabled,
|
|
bool temporal_layers_supported = true);
|
|
|
|
bool ScreenshareSimulcastFieldTrialEnabled();
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // MEDIA_ENGINE_SIMULCAST_H_
|