5cbc528c03
This reverts commit 715c4765b1ac20017e6e3b8b925d02536c6610c3. Reason for revert: Breaks WebRTC roll to Chromium. https://chromium-review.googlesource.com/c/chromium/src/+/1484629 # Fatal error in: ../../third_party/webrtc/modules/rtp_rtcp/source/rtp_sender.cc, line 796 # last system error: 0 # Check failed: diff_ms >= static_cast<int64_t>(0) (-307 vs. 0) # Original change's description: > Remove VCMEncoderDataBase and put remaining code into VideoStreamEncoder > > Since this "data base" only holds a single encoder instance it just > serves to confuse object ownership. Removing it and giving ownership > of generic encoder instance to VideoStreamEncoder. > > This CL also removes VideoSender interface from video_coding_impl.h, > which is mostly a leftover from > https://webrtc-review.googlesource.com/c/src/+/123540 > > Bug: webrtc:10164 > Change-Id: I9b7fec940dbcbccf3aa1278c2555da3bd5169ae1 > Reviewed-on: https://webrtc-review.googlesource.com/c/123920 > Commit-Queue: Erik Språng <sprang@webrtc.org> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#26835} TBR=brandtr@webrtc.org,nisse@webrtc.org,sprang@webrtc.org Change-Id: I5432878c4c2e497cd848c4ce1b190e0307df03ca Bug: webrtc:10164 Reviewed-on: https://webrtc-review.googlesource.com/c/124402 Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26841}
69 lines
2.2 KiB
C++
69 lines
2.2 KiB
C++
/*
|
|
* Copyright (c) 2018 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_ENCODER_DATABASE_H_
|
|
#define MODULES_VIDEO_CODING_ENCODER_DATABASE_H_
|
|
|
|
#include <stddef.h>
|
|
#include <memory>
|
|
|
|
#include "api/video_codecs/video_codec.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "modules/video_coding/generic_encoder.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VCMEncoderDataBase {
|
|
public:
|
|
explicit VCMEncoderDataBase(VCMEncodedFrameCallback* encoded_frame_callback);
|
|
~VCMEncoderDataBase();
|
|
|
|
// Sets the sender side codec and initiates the desired codec given the
|
|
// VideoCodec struct.
|
|
// Returns true if the codec was successfully registered, false otherwise.
|
|
bool SetSendCodec(const VideoCodec* send_codec,
|
|
int number_of_cores,
|
|
size_t max_payload_size);
|
|
|
|
// Registers and initializes an external encoder object.
|
|
// |internal_source| should be set to true if the codec has an internal
|
|
// video source and doesn't need the user to provide it with frames via
|
|
// the Encode() method.
|
|
void RegisterExternalEncoder(VideoEncoder* external_encoder,
|
|
bool internal_source);
|
|
|
|
// Deregisters any external encoder.
|
|
void DeregisterExternalEncoder();
|
|
|
|
VCMGenericEncoder* GetEncoder();
|
|
|
|
bool MatchesCurrentResolution(int width, int height) const;
|
|
|
|
private:
|
|
// Determines whether a new codec has to be created or not.
|
|
// Checks every setting apart from maxFramerate and startBitrate.
|
|
bool RequiresEncoderReset(const VideoCodec& send_codec);
|
|
|
|
void DeleteEncoder();
|
|
|
|
int number_of_cores_;
|
|
size_t max_payload_size_;
|
|
bool pending_encoder_reset_;
|
|
VideoCodec send_codec_;
|
|
VideoEncoder* external_encoder_;
|
|
bool internal_source_;
|
|
VCMEncodedFrameCallback* const encoded_frame_callback_;
|
|
std::unique_ptr<VCMGenericEncoder> ptr_encoder_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_ENCODER_DATABASE_H_
|