6f440ed5b5
This reverts commit 07efe436c9002e139845f62486e3ee4e29f0d85b. Reason for revert: Breaks downstream project. cricket::GetSimulcastConfig method signature has been updated. I think you can get away with a default value for temporal_layers_supported (and then you can remove it after a few days when projects will be updated). Original change's description: > Implement H264 simulcast support and generalize SimulcastEncoderAdapter use for H264 & VP8. > > * Move SimulcastEncoderAdapter out under modules/video_coding > * Move SimulcastRateAllocator back out to modules/video_coding/utility > * Move TemporalLayers and ScreenshareLayers to modules/video_coding/utility > * Move any VP8 specific code - such as temporal layer bitrate budgeting - > under codec type dependent conditionals. > * Plumb the simulcast index for H264 in the codec specific and RTP format data structures. > > Bug: webrtc:5840 > Change-Id: Ieced8a00e38f273c1a6cfd0f5431a87d07b8f44e > Reviewed-on: https://webrtc-review.googlesource.com/64100 > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23705} TBR=sprang@webrtc.org,stefan@webrtc.org,mflodman@webrtc.org,hta@webrtc.org,sergio.garcia.murillo@gmail.com,titovartem@webrtc.org,agouaillard@gmail.com Change-Id: Ic9d3b1eeaf195bb5ec2063954421f5e77866d663 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:5840 Reviewed-on: https://webrtc-review.googlesource.com/84760 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23710}
67 lines
2.3 KiB
C++
67 lines
2.3 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 <string>
|
|
#include <vector>
|
|
|
|
#include "api/video_codecs/video_encoder_config.h"
|
|
|
|
namespace cricket {
|
|
|
|
// TODO(pthatcher): Write unit tests just for these functions,
|
|
// independent of WebrtcVideoEngine.
|
|
|
|
// 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.
|
|
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);
|
|
|
|
// 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,
|
|
int max_framerate);
|
|
|
|
// 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,
|
|
int max_framerate,
|
|
bool screenshare_simulcast_enabled);
|
|
|
|
bool ScreenshareSimulcastFieldTrialEnabled();
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // MEDIA_ENGINE_SIMULCAST_H_
|