02b3d275a0
Reason for revert: A fix is being prepared downstream so this can now go in. Original issue's description: > Revert of Deprecate VCMPacketizationCallback::SendData and use EncodedImageCallback instead. (patchset #5 id:80001 of https://codereview.webrtc.org/1897233002/ ) > > Reason for revert: > API changes broke downstream. > > Original issue's description: > > Deprecate VCMPacketizationCallback::SendData and use EncodedImageCallback instead. > > EncodedImageCallback is used by all encoder implementations and seems to be what we should try to use in the transport. > > EncodedImageCallback can of course be cleaned up in the future. > > > > This moves creation of RTPVideoHeader from the GenericEncoder to the PayLoadRouter. > > > > BUG=webrtc::5687 > > > > Committed: https://crrev.com/f5d55aaecdc39e9cc66eb6e87614f04afe28f6eb > > Cr-Commit-Position: refs/heads/master@{#12436} > > TBR=stefan@webrtc.org,pbos@webrtc.org,perkj@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5687 > > Committed: https://crrev.com/a261e6136655af33f283eda8e60a6dd93dd746a4 > Cr-Commit-Position: refs/heads/master@{#12441} TBR=stefan@webrtc.org,pbos@webrtc.org,perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5687 Review URL: https://codereview.webrtc.org/1905583002 Cr-Commit-Position: refs/heads/master@{#12442}
101 lines
3.2 KiB
C++
101 lines
3.2 KiB
C++
/*
|
|
* Copyright (c) 2012 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 WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_
|
|
|
|
#include <stdio.h>
|
|
#include <vector>
|
|
|
|
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
|
|
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
|
|
namespace webrtc {
|
|
class CriticalSectionWrapper;
|
|
|
|
namespace media_optimization {
|
|
class MediaOptimization;
|
|
} // namespace media_optimization
|
|
|
|
struct EncoderParameters {
|
|
uint32_t target_bitrate;
|
|
uint8_t loss_rate;
|
|
int64_t rtt;
|
|
uint32_t input_frame_rate;
|
|
};
|
|
|
|
class VCMEncodedFrameCallback : public EncodedImageCallback {
|
|
public:
|
|
explicit VCMEncodedFrameCallback(EncodedImageCallback* post_encode_callback);
|
|
virtual ~VCMEncodedFrameCallback();
|
|
|
|
// Implements EncodedImageCallback.
|
|
int32_t Encoded(const EncodedImage& encoded_image,
|
|
const CodecSpecificInfo* codec_specific,
|
|
const RTPFragmentationHeader* fragmentation_header) override;
|
|
int32_t SetTransportCallback(VCMPacketizationCallback* transport);
|
|
void SetMediaOpt(media_optimization::MediaOptimization* media_opt);
|
|
void SetInternalSource(bool internal_source) {
|
|
internal_source_ = internal_source;
|
|
}
|
|
void SignalLastEncoderImplementationUsed(
|
|
const char* encoder_implementation_name);
|
|
|
|
private:
|
|
VCMPacketizationCallback* send_callback_;
|
|
media_optimization::MediaOptimization* media_opt_;
|
|
bool internal_source_;
|
|
|
|
EncodedImageCallback* post_encode_callback_;
|
|
};
|
|
|
|
class VCMGenericEncoder {
|
|
friend class VCMCodecDataBase;
|
|
|
|
public:
|
|
VCMGenericEncoder(VideoEncoder* encoder,
|
|
VideoEncoderRateObserver* rate_observer,
|
|
VCMEncodedFrameCallback* encoded_frame_callback,
|
|
bool internal_source);
|
|
~VCMGenericEncoder();
|
|
int32_t Release();
|
|
int32_t InitEncode(const VideoCodec* settings,
|
|
int32_t number_of_cores,
|
|
size_t max_payload_size);
|
|
int32_t Encode(const VideoFrame& frame,
|
|
const CodecSpecificInfo* codec_specific,
|
|
const std::vector<FrameType>& frame_types);
|
|
|
|
void SetEncoderParameters(const EncoderParameters& params);
|
|
EncoderParameters GetEncoderParameters() const;
|
|
|
|
int32_t SetPeriodicKeyFrames(bool enable);
|
|
int32_t RequestFrame(const std::vector<FrameType>& frame_types);
|
|
bool InternalSource() const;
|
|
void OnDroppedFrame();
|
|
bool SupportsNativeHandle() const;
|
|
int GetTargetFramerate();
|
|
|
|
private:
|
|
VideoEncoder* const encoder_;
|
|
VideoEncoderRateObserver* const rate_observer_;
|
|
VCMEncodedFrameCallback* const vcm_encoded_frame_callback_;
|
|
const bool internal_source_;
|
|
rtc::CriticalSection params_lock_;
|
|
EncoderParameters encoder_params_ GUARDED_BY(params_lock_);
|
|
bool is_screenshare_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_
|