92be1caf4f
This reverts commit bc900cb1d1810fcf678fe41cf1e3966daa39c88c. Reason for revert: Broke downstream projects. 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} TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org Change-Id: I01f06c1fcf21eb2cd40dca7d4f268614200ee490 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8830 Reviewed-on: https://webrtc-review.googlesource.com/63720 Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22537}
60 lines
2.1 KiB
C++
60 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,
|
|
const std::string& payload_name,
|
|
int payload_type,
|
|
bool nack_enabled);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_
|