mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
58 lines
2.1 KiB
C++
58 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2019 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 "api/video_codecs/vp8_temporal_layers_factory.h"
|
|
|
|
#include <algorithm>
|
|
#include <memory>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "api/fec_controller_override.h"
|
|
#include "modules/video_coding/codecs/vp8/default_temporal_layers.h"
|
|
#include "modules/video_coding/codecs/vp8/screenshare_layers.h"
|
|
#include "modules/video_coding/utility/simulcast_utility.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
std::unique_ptr<Vp8FrameBufferController> Vp8TemporalLayersFactory::Create(
|
|
const VideoCodec& codec,
|
|
const VideoEncoder::Settings& settings,
|
|
FecControllerOverride* fec_controller_override) {
|
|
std::vector<std::unique_ptr<Vp8FrameBufferController>> controllers;
|
|
const int num_streams = SimulcastUtility::NumberOfSimulcastStreams(codec);
|
|
RTC_DCHECK_GE(num_streams, 1);
|
|
controllers.reserve(num_streams);
|
|
|
|
for (int i = 0; i < num_streams; ++i) {
|
|
int num_temporal_layers =
|
|
SimulcastUtility::NumberOfTemporalLayers(codec, i);
|
|
if (SimulcastUtility::IsConferenceModeScreenshare(codec) && i == 0) {
|
|
// Legacy screenshare layers supports max 2 layers.
|
|
num_temporal_layers = std::max(2, num_temporal_layers);
|
|
controllers.push_back(
|
|
std::make_unique<ScreenshareLayers>(num_temporal_layers));
|
|
} else {
|
|
controllers.push_back(
|
|
std::make_unique<DefaultTemporalLayers>(num_temporal_layers));
|
|
}
|
|
}
|
|
|
|
return std::make_unique<Vp8TemporalLayers>(std::move(controllers),
|
|
fec_controller_override);
|
|
}
|
|
|
|
std::unique_ptr<Vp8FrameBufferControllerFactory>
|
|
Vp8TemporalLayersFactory::Clone() const {
|
|
return std::make_unique<Vp8TemporalLayersFactory>();
|
|
}
|
|
|
|
} // namespace webrtc
|