- Rename GenerateFec -> EncodeFec in ForwardErrorCorrection. This naming
is more consistent with DecodeFec.
- Add appropriate using directives, to reduce clutter in tests.
- Move ConstructMediaPackets to fec_test_helper.{h,cc}. This will help
future tests of ULPFEC/FlexFEC header formatters.
- Generalize tests in rtp_fec_unittest.cc to typed tests. This will help
testing ForwardErrorCorrection with both ULPFEC and FlexFEC.
This CL should not impact functionality or performance.
BUG=webrtc:5654
Review-Url: https://codereview.webrtc.org/2267393002
Cr-Commit-Position: refs/heads/master@{#14314}
94 lines
2.8 KiB
C++
94 lines
2.8 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_FEC_TEST_HELPER_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_
|
|
|
|
#include "webrtc/base/basictypes.h"
|
|
#include "webrtc/base/random.h"
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
// Needed to not clash with another webrtc::FrameGenerator.
|
|
namespace fec {
|
|
|
|
struct RawRtpPacket : public ForwardErrorCorrection::Packet {
|
|
WebRtcRTPHeader header;
|
|
};
|
|
|
|
class FrameGenerator {
|
|
public:
|
|
FrameGenerator();
|
|
|
|
void NewFrame(int num_packets);
|
|
|
|
uint16_t NextSeqNum();
|
|
|
|
RawRtpPacket* NextPacket(int offset, size_t length);
|
|
|
|
// Creates a new RtpPacket with the RED header added to the packet.
|
|
RawRtpPacket* BuildMediaRedPacket(const RawRtpPacket* packet);
|
|
|
|
// Creates a new RtpPacket with FEC payload and red header. Does this by
|
|
// creating a new fake media RtpPacket, clears the marker bit and adds a RED
|
|
// header. Finally replaces the payload with the content of |packet->data|.
|
|
RawRtpPacket* BuildFecRedPacket(const ForwardErrorCorrection::Packet* packet);
|
|
|
|
void SetRedHeader(ForwardErrorCorrection::Packet* red_packet,
|
|
uint8_t payload_type,
|
|
size_t header_length) const;
|
|
|
|
private:
|
|
static void BuildRtpHeader(uint8_t* data, const RTPHeader* header);
|
|
|
|
int num_packets_;
|
|
uint16_t seq_num_;
|
|
uint32_t timestamp_;
|
|
};
|
|
|
|
class MediaPacketGenerator {
|
|
public:
|
|
MediaPacketGenerator(uint32_t min_packet_size,
|
|
uint32_t max_packet_size,
|
|
uint32_t ssrc,
|
|
Random* random)
|
|
: min_packet_size_(min_packet_size),
|
|
max_packet_size_(max_packet_size),
|
|
ssrc_(ssrc),
|
|
random_(random) {}
|
|
|
|
// Construct the media packets, up to |num_media_packets| packets.
|
|
ForwardErrorCorrection::PacketList ConstructMediaPackets(
|
|
int num_media_packets,
|
|
uint16_t start_seq_num);
|
|
ForwardErrorCorrection::PacketList ConstructMediaPackets(
|
|
int num_media_packets);
|
|
|
|
uint16_t GetFecSeqNum();
|
|
|
|
private:
|
|
uint32_t min_packet_size_;
|
|
uint32_t max_packet_size_;
|
|
uint32_t ssrc_;
|
|
Random* random_;
|
|
|
|
ForwardErrorCorrection::PacketList media_packets_;
|
|
uint16_t fec_seq_num_;
|
|
};
|
|
|
|
} // namespace fec
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_
|