Reason for revert:
Breaks fuzzer.
Original issue's description:
> Only compare sequence numbers from the same SSRC in ForwardErrorCorrection.
>
> Prior to this CL, the ForwardErrorCorrection state would be reset whenever
> the difference in sequence numbers of the last recovered media packet
> and the new packet (media or FEC) was too large. This comparison did not
> take into account that FlexFEC uses a different SSRC for the FEC packets,
> meaning that the the state would be reset very frequently when FlexFEC
> is used. This should not have led to any major problems, except for a
> decreased decoding efficiency.
>
> This CL verifies that whenever we compare sequence numbers in
> ForwardErrorCorrection, they do indeed belong to the same SSRC.
>
> BUG=webrtc:5654
>
> Review-Url: https://codereview.webrtc.org/2893293003
> Cr-Commit-Position: refs/heads/master@{#18399}
> Committed: 1476a9d789
TBR=stefan@webrtc.org,holmer@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:5654
Review-Url: https://codereview.webrtc.org/2919313005
Cr-Commit-Position: refs/heads/master@{#18446}
135 lines
4.3 KiB
C++
135 lines
4.3 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 <memory>
|
|
|
|
#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 {
|
|
namespace fec {
|
|
|
|
struct AugmentedPacket : public ForwardErrorCorrection::Packet {
|
|
WebRtcRTPHeader header;
|
|
};
|
|
|
|
// TODO(brandtr): Consider merging MediaPacketGenerator and
|
|
// AugmentedPacketGenerator into a single class, since their functionality is
|
|
// similar.
|
|
|
|
// This class generates media packets corresponding to a single frame.
|
|
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_;
|
|
};
|
|
|
|
// This class generates media packets with a certain structure of the payload.
|
|
class AugmentedPacketGenerator {
|
|
public:
|
|
explicit AugmentedPacketGenerator(uint32_t ssrc);
|
|
|
|
// Prepare for generating a new set of packets, corresponding to a frame.
|
|
void NewFrame(size_t num_packets);
|
|
|
|
// Increment and return the newly incremented sequence number.
|
|
uint16_t NextPacketSeqNum();
|
|
|
|
// Return the next packet in the current frame.
|
|
std::unique_ptr<AugmentedPacket> NextPacket(size_t offset, size_t length);
|
|
|
|
protected:
|
|
// Given |header|, writes the appropriate RTP header fields in |data|.
|
|
static void WriteRtpHeader(const RTPHeader& header, uint8_t* data);
|
|
|
|
// Number of packets left to generate, in the current frame.
|
|
size_t num_packets_;
|
|
|
|
private:
|
|
uint32_t ssrc_;
|
|
uint16_t seq_num_;
|
|
uint32_t timestamp_;
|
|
};
|
|
|
|
// This class generates media and FlexFEC packets for a single frame.
|
|
class FlexfecPacketGenerator : public AugmentedPacketGenerator {
|
|
public:
|
|
FlexfecPacketGenerator(uint32_t media_ssrc, uint32_t flexfec_ssrc);
|
|
|
|
// Creates a new AugmentedPacket (with RTP headers) from a
|
|
// FlexFEC packet (without RTP headers).
|
|
std::unique_ptr<AugmentedPacket> BuildFlexfecPacket(
|
|
const ForwardErrorCorrection::Packet& packet);
|
|
|
|
private:
|
|
uint32_t flexfec_ssrc_;
|
|
uint16_t flexfec_seq_num_;
|
|
uint32_t flexfec_timestamp_;
|
|
};
|
|
|
|
// This class generates media and ULPFEC packets (both encapsulated in RED)
|
|
// for a single frame.
|
|
class UlpfecPacketGenerator : public AugmentedPacketGenerator {
|
|
public:
|
|
explicit UlpfecPacketGenerator(uint32_t ssrc);
|
|
|
|
// Creates a new AugmentedPacket with the RED header added to the packet.
|
|
static std::unique_ptr<AugmentedPacket> BuildMediaRedPacket(
|
|
const AugmentedPacket& packet);
|
|
|
|
// Creates a new AugmentedPacket with FEC payload and RED header. Does this by
|
|
// creating a new fake media AugmentedPacket, clears the marker bit and adds a
|
|
// RED header. Finally replaces the payload with the content of
|
|
// |packet->data|.
|
|
std::unique_ptr<AugmentedPacket> BuildUlpfecRedPacket(
|
|
const ForwardErrorCorrection::Packet& packet);
|
|
|
|
private:
|
|
static void SetRedHeader(uint8_t payload_type,
|
|
size_t header_length,
|
|
AugmentedPacket* red_packet);
|
|
};
|
|
|
|
} // namespace fec
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_
|