mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 15:20:42 +01:00
6c2c13af06
This reverts commit04dd176862. Reason for revert: Regression in ramp up perf tests. Original change's description: > Reland "Move rtp-specific config out of EncoderSettings." > > This is a reland ofbc900cb1d1> > Original change's description: > > Move rtp-specific config out of EncoderSettings. > > > > In VideoSendStream::Config, move payload_name and payload_type from > > EncoderSettings to Rtp. > > > > EncoderSettings now contains configuration for VideoStreamEncoder only, > > and should perhaps be renamed in a follow up cl. It's no longer > > passed as an argument to VideoCodecInitializer::SetupCodec. > > > > The latter then needs a different way to know the codec type, > > which is provided by a new codec_type member in VideoEncoderConfig. > > > > Bug: webrtc:8830 > > Change-Id: Ifcc691aef1ee6a95e43c0452c5e630d92a511cd6 > > Reviewed-on: https://webrtc-review.googlesource.com/62062 > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22532} > > Bug: webrtc:8830 > Change-Id: If88ef7d57cdaa4fae3c7b2a97ea5a6e1b833e019 > Reviewed-on: https://webrtc-review.googlesource.com/63721 > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Commit-Queue: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22595} TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org Bug: webrtc:8830,chromium:827080 Change-Id: Iaaf146de91ec5c0d741b8efdf143f7e173084fef Reviewed-on: https://webrtc-review.googlesource.com/65520 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22677}
59 lines
2.1 KiB
C++
59 lines
2.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_INCLUDE_VIDEO_CODEC_INITIALIZER_H_
|
|
#define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "call/video_send_stream.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VideoBitrateAllocator;
|
|
class VideoCodec;
|
|
class VideoEncoderConfig;
|
|
|
|
class VideoCodecInitializer {
|
|
public:
|
|
// Takes an EncoderSettings, a VideoEncoderConfig and the VideoStream
|
|
// configuration and translated them into the old school VideoCodec type.
|
|
// It also creates a VideoBitrateAllocator instance, suitable for the codec
|
|
// type used. For instance, VP8 will create an allocator than can handle
|
|
// simulcast and temporal layering.
|
|
// GetBitrateAllocator is called implicitly from here, no need to call again.
|
|
static bool SetupCodec(
|
|
const VideoEncoderConfig& config,
|
|
const VideoSendStream::Config::EncoderSettings settings,
|
|
const std::vector<VideoStream>& streams,
|
|
bool nack_enabled,
|
|
VideoCodec* codec,
|
|
std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator);
|
|
|
|
// Create a bitrate allocator for the specified codec. |tl_factory| is
|
|
// optional, if it is populated, ownership of that instance will be
|
|
// transferred to the VideoBitrateAllocator instance.
|
|
static std::unique_ptr<VideoBitrateAllocator> CreateBitrateAllocator(
|
|
const VideoCodec& codec);
|
|
|
|
private:
|
|
static VideoCodec VideoEncoderConfigToVideoCodec(
|
|
const VideoEncoderConfig& config,
|
|
const std::vector<VideoStream>& streams,
|
|
// TODO(nisse): Delete when we can rely on config.codec_type.
|
|
VideoCodecType codec_type,
|
|
bool nack_enabled);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_
|