This changes the following module directories:
* webrtc/modules/audio_conference_mixer/interface
* webrtc/modules/interface
* webrtc/modules/media_file/interface
* webrtc/modules/rtp_rtcp/interface
* webrtc/modules/utility/interface
To avoid breaking downstream, I followed this recipe:
1. Copy the interface dir to a new sibling directory: include
2. Update the header guards in the include directory to match the style guide.
3. Update the header guards in the interface directory to match the ones in include. This is required to avoid getting redefinitions in the not-yet-updated downstream code.
4. Add a pragma warning in the header files in the interface dir. Example:
#pragma message("WARNING: webrtc/modules/interface is DEPRECATED; "
"use webrtc/modules/include")
5. Search for all source references to webrtc/modules/interface and update them to webrtc/modules/include (*.c*,*.h,*.mm,*.S)
6. Update all GYP+GN files. This required manual inspection since many subdirectories of webrtc/modules referenced the interface dir using ../interface etc(*.gyp*,*.gn*)
BUG=5095
TESTED=Passing compile-trybots with --clobber flag:
git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel -m tryserver.webrtc
R=stefan@webrtc.org, tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1417683006 .
Cr-Commit-Position: refs/heads/master@{#10500}
130 lines
4.5 KiB
C++
130 lines
4.5 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_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
|
|
|
|
#include <list>
|
|
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/base/thread_annotations.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/bitrate.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/producer_fec.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/video_codec_information.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
class CriticalSectionWrapper;
|
|
struct RtpPacket;
|
|
|
|
class RTPSenderVideo {
|
|
public:
|
|
RTPSenderVideo(Clock* clock, RTPSenderInterface* rtpSender);
|
|
virtual ~RTPSenderVideo();
|
|
|
|
virtual RtpVideoCodecTypes VideoCodecType() const;
|
|
|
|
size_t FECPacketOverhead() const;
|
|
|
|
static RtpUtility::Payload* CreateVideoPayload(
|
|
const char payloadName[RTP_PAYLOAD_NAME_SIZE],
|
|
const int8_t payloadType,
|
|
const uint32_t maxBitRate);
|
|
|
|
int32_t SendVideo(const RtpVideoCodecTypes videoType,
|
|
const FrameType frameType,
|
|
const int8_t payloadType,
|
|
const uint32_t captureTimeStamp,
|
|
int64_t capture_time_ms,
|
|
const uint8_t* payloadData,
|
|
const size_t payloadSize,
|
|
const RTPFragmentationHeader* fragmentation,
|
|
const RTPVideoHeader* rtpHdr);
|
|
|
|
int32_t SendRTPIntraRequest();
|
|
|
|
void SetVideoCodecType(RtpVideoCodecTypes type);
|
|
|
|
void SetMaxConfiguredBitrateVideo(const uint32_t maxBitrate);
|
|
|
|
uint32_t MaxConfiguredBitrateVideo() const;
|
|
|
|
// FEC
|
|
void SetGenericFECStatus(const bool enable,
|
|
const uint8_t payloadTypeRED,
|
|
const uint8_t payloadTypeFEC);
|
|
|
|
void GenericFECStatus(bool& enable,
|
|
uint8_t& payloadTypeRED,
|
|
uint8_t& payloadTypeFEC) const;
|
|
|
|
void SetFecParameters(const FecProtectionParams* delta_params,
|
|
const FecProtectionParams* key_params);
|
|
|
|
void ProcessBitrate();
|
|
|
|
uint32_t VideoBitrateSent() const;
|
|
uint32_t FecOverheadRate() const;
|
|
|
|
int SelectiveRetransmissions() const;
|
|
void SetSelectiveRetransmissions(uint8_t settings);
|
|
|
|
private:
|
|
void SendVideoPacket(uint8_t* dataBuffer,
|
|
const size_t payloadLength,
|
|
const size_t rtpHeaderLength,
|
|
uint16_t seq_num,
|
|
const uint32_t capture_timestamp,
|
|
int64_t capture_time_ms,
|
|
StorageType storage);
|
|
|
|
void SendVideoPacketAsRed(uint8_t* dataBuffer,
|
|
const size_t payloadLength,
|
|
const size_t rtpHeaderLength,
|
|
uint16_t video_seq_num,
|
|
const uint32_t capture_timestamp,
|
|
int64_t capture_time_ms,
|
|
StorageType media_packet_storage,
|
|
bool protect);
|
|
|
|
RTPSenderInterface& _rtpSender;
|
|
|
|
// Should never be held when calling out of this class.
|
|
const rtc::scoped_ptr<CriticalSectionWrapper> crit_;
|
|
|
|
RtpVideoCodecTypes _videoType;
|
|
uint32_t _maxBitrate;
|
|
int32_t _retransmissionSettings GUARDED_BY(crit_);
|
|
|
|
// FEC
|
|
ForwardErrorCorrection _fec;
|
|
bool _fecEnabled GUARDED_BY(crit_);
|
|
int8_t _payloadTypeRED GUARDED_BY(crit_);
|
|
int8_t _payloadTypeFEC GUARDED_BY(crit_);
|
|
FecProtectionParams delta_fec_params_ GUARDED_BY(crit_);
|
|
FecProtectionParams key_fec_params_ GUARDED_BY(crit_);
|
|
ProducerFec producer_fec_ GUARDED_BY(crit_);
|
|
|
|
// Bitrate used for FEC payload, RED headers, RTP headers for FEC packets
|
|
// and any padding overhead.
|
|
Bitrate _fecOverheadRate;
|
|
// Bitrate used for video payload and RTP headers
|
|
Bitrate _videoBitrate;
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
|