webrtc_m130/call/rtx_receive_stream.h

61 lines
2.2 KiB
C
Raw Normal View History

/*
* Copyright (c) 2017 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 CALL_RTX_RECEIVE_STREAM_H_
#define CALL_RTX_RECEIVE_STREAM_H_
#include <cstdint>
#include <map>
#include "api/sequence_checker.h"
#include "call/rtp_packet_sink_interface.h"
#include "rtc_base/system/no_unique_address.h"
#include "rtc_base/thread_annotations.h"
namespace webrtc {
Reland of Use RtxReceiveStream. (patchset #1 id:1 of https://codereview.webrtc.org/3007303002/ ) Reason for revert: Identified a configuration problem in the video quality tests. Intend to fix and reland. Original issue's description: > Revert of Use RtxReceiveStream. (patchset #5 id:320001 of https://codereview.webrtc.org/3006063002/ ) > > Reason for revert: > This change appears to break ulpfec, with severe regressions, e.g., for webrtc_perf_test FullStackTest.ForemanCifPlr5Ulpfec > > Original issue's description: > > Reland of Use RtxReceiveStream. (patchset #1 id:1 of https://codereview.webrtc.org/3010983002/ ) > > > > Reason for revert: > > Intend to fix perf failures and reland. > > > > Original issue's description: > > > Revert of Use RtxReceiveStream. (patchset #5 id:80001 of https://codereview.webrtc.org/3008773002/ ) > > > > > > Reason for revert: > > > A few perf tests broken, including > > > > > > RampUpTest.UpDownUpAbsSendTimeSimulcastRedRtx > > > RampUpTest.UpDownUpTransportSequenceNumberRtx > > > RampUpTest.UpDownUpTransportSequenceNumberPacketLoss > > > > > > > > > Original issue's description: > > > > Use RtxReceiveStream. > > > > > > > > This also has the beneficial side-effect that when a media stream > > > > which is protected by FlexFEC receives an RTX retransmission, the > > > > retransmitted media packet is passed into the FlexFEC machinery, > > > > which should improve its ability to recover packets via FEC. > > > > > > > > BUG=webrtc:7135 > > > > > > > > Review-Url: https://codereview.webrtc.org/3008773002 > > > > Cr-Commit-Position: refs/heads/master@{#19649} > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/5c0f6c62ea3b1d2c43f8fc152961af27033475f7 > > > > > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:7135 > > > > > > Review-Url: https://codereview.webrtc.org/3010983002 > > > Cr-Commit-Position: refs/heads/master@{#19653} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/3c39c0137afa274d1d524b150b50304b38a2847b > > > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > BUG=webrtc:7135 > > > > Review-Url: https://codereview.webrtc.org/3006063002 > > Cr-Commit-Position: refs/heads/master@{#19715} > > Committed: https://chromium.googlesource.com/external/webrtc/+/35713eaf565c0fef07c8afc158d7b8fdf7ec3d78 > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7135 > > Review-Url: https://codereview.webrtc.org/3007303002 > Cr-Commit-Position: refs/heads/master@{#19744} > Committed: https://chromium.googlesource.com/external/webrtc/+/8e7eee035178a7f10e19883681b5eaa4a7523107 TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7135 Review-Url: https://codereview.webrtc.org/3012963002 Cr-Commit-Position: refs/heads/master@{#19765}
2017-09-11 02:32:16 -07:00
class ReceiveStatistics;
// This class is responsible for RTX decapsulation. The resulting media packets
// are passed on to a sink representing the associated media stream.
class RtxReceiveStream : public RtpPacketSinkInterface {
public:
RtxReceiveStream(RtpPacketSinkInterface* media_sink,
std::map<int, int> associated_payload_types,
Reland of Use RtxReceiveStream. (patchset #1 id:1 of https://codereview.webrtc.org/3007303002/ ) Reason for revert: Identified a configuration problem in the video quality tests. Intend to fix and reland. Original issue's description: > Revert of Use RtxReceiveStream. (patchset #5 id:320001 of https://codereview.webrtc.org/3006063002/ ) > > Reason for revert: > This change appears to break ulpfec, with severe regressions, e.g., for webrtc_perf_test FullStackTest.ForemanCifPlr5Ulpfec > > Original issue's description: > > Reland of Use RtxReceiveStream. (patchset #1 id:1 of https://codereview.webrtc.org/3010983002/ ) > > > > Reason for revert: > > Intend to fix perf failures and reland. > > > > Original issue's description: > > > Revert of Use RtxReceiveStream. (patchset #5 id:80001 of https://codereview.webrtc.org/3008773002/ ) > > > > > > Reason for revert: > > > A few perf tests broken, including > > > > > > RampUpTest.UpDownUpAbsSendTimeSimulcastRedRtx > > > RampUpTest.UpDownUpTransportSequenceNumberRtx > > > RampUpTest.UpDownUpTransportSequenceNumberPacketLoss > > > > > > > > > Original issue's description: > > > > Use RtxReceiveStream. > > > > > > > > This also has the beneficial side-effect that when a media stream > > > > which is protected by FlexFEC receives an RTX retransmission, the > > > > retransmitted media packet is passed into the FlexFEC machinery, > > > > which should improve its ability to recover packets via FEC. > > > > > > > > BUG=webrtc:7135 > > > > > > > > Review-Url: https://codereview.webrtc.org/3008773002 > > > > Cr-Commit-Position: refs/heads/master@{#19649} > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/5c0f6c62ea3b1d2c43f8fc152961af27033475f7 > > > > > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:7135 > > > > > > Review-Url: https://codereview.webrtc.org/3010983002 > > > Cr-Commit-Position: refs/heads/master@{#19653} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/3c39c0137afa274d1d524b150b50304b38a2847b > > > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > BUG=webrtc:7135 > > > > Review-Url: https://codereview.webrtc.org/3006063002 > > Cr-Commit-Position: refs/heads/master@{#19715} > > Committed: https://chromium.googlesource.com/external/webrtc/+/35713eaf565c0fef07c8afc158d7b8fdf7ec3d78 > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7135 > > Review-Url: https://codereview.webrtc.org/3007303002 > Cr-Commit-Position: refs/heads/master@{#19744} > Committed: https://chromium.googlesource.com/external/webrtc/+/8e7eee035178a7f10e19883681b5eaa4a7523107 TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7135 Review-Url: https://codereview.webrtc.org/3012963002 Cr-Commit-Position: refs/heads/master@{#19765}
2017-09-11 02:32:16 -07:00
uint32_t media_ssrc,
// TODO(nisse): Delete this argument, and
// corresponding member variable, by moving the
// responsibility for rtcp feedback to
// RtpStreamReceiverController.
ReceiveStatistics* rtp_receive_statistics = nullptr);
~RtxReceiveStream() override;
// Update payload types post construction. Must be called from the same
// calling context as `OnRtpPacket` is called on.
void SetAssociatedPayloadTypes(std::map<int, int> associated_payload_types);
// RtpPacketSinkInterface.
void OnRtpPacket(const RtpPacketReceived& packet) override;
private:
RTC_NO_UNIQUE_ADDRESS SequenceChecker packet_checker_;
RtpPacketSinkInterface* const media_sink_;
// Map from rtx payload type -> media payload type.
std::map<int, int> associated_payload_types_ RTC_GUARDED_BY(&packet_checker_);
// TODO(nisse): Ultimately, the media receive stream shouldn't care about the
// ssrc, and we should delete this.
const uint32_t media_ssrc_;
Reland of Use RtxReceiveStream. (patchset #1 id:1 of https://codereview.webrtc.org/3007303002/ ) Reason for revert: Identified a configuration problem in the video quality tests. Intend to fix and reland. Original issue's description: > Revert of Use RtxReceiveStream. (patchset #5 id:320001 of https://codereview.webrtc.org/3006063002/ ) > > Reason for revert: > This change appears to break ulpfec, with severe regressions, e.g., for webrtc_perf_test FullStackTest.ForemanCifPlr5Ulpfec > > Original issue's description: > > Reland of Use RtxReceiveStream. (patchset #1 id:1 of https://codereview.webrtc.org/3010983002/ ) > > > > Reason for revert: > > Intend to fix perf failures and reland. > > > > Original issue's description: > > > Revert of Use RtxReceiveStream. (patchset #5 id:80001 of https://codereview.webrtc.org/3008773002/ ) > > > > > > Reason for revert: > > > A few perf tests broken, including > > > > > > RampUpTest.UpDownUpAbsSendTimeSimulcastRedRtx > > > RampUpTest.UpDownUpTransportSequenceNumberRtx > > > RampUpTest.UpDownUpTransportSequenceNumberPacketLoss > > > > > > > > > Original issue's description: > > > > Use RtxReceiveStream. > > > > > > > > This also has the beneficial side-effect that when a media stream > > > > which is protected by FlexFEC receives an RTX retransmission, the > > > > retransmitted media packet is passed into the FlexFEC machinery, > > > > which should improve its ability to recover packets via FEC. > > > > > > > > BUG=webrtc:7135 > > > > > > > > Review-Url: https://codereview.webrtc.org/3008773002 > > > > Cr-Commit-Position: refs/heads/master@{#19649} > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/5c0f6c62ea3b1d2c43f8fc152961af27033475f7 > > > > > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:7135 > > > > > > Review-Url: https://codereview.webrtc.org/3010983002 > > > Cr-Commit-Position: refs/heads/master@{#19653} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/3c39c0137afa274d1d524b150b50304b38a2847b > > > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > BUG=webrtc:7135 > > > > Review-Url: https://codereview.webrtc.org/3006063002 > > Cr-Commit-Position: refs/heads/master@{#19715} > > Committed: https://chromium.googlesource.com/external/webrtc/+/35713eaf565c0fef07c8afc158d7b8fdf7ec3d78 > > TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7135 > > Review-Url: https://codereview.webrtc.org/3007303002 > Cr-Commit-Position: refs/heads/master@{#19744} > Committed: https://chromium.googlesource.com/external/webrtc/+/8e7eee035178a7f10e19883681b5eaa4a7523107 TBR=brandtr@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org,magjed@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7135 Review-Url: https://codereview.webrtc.org/3012963002 Cr-Commit-Position: refs/heads/master@{#19765}
2017-09-11 02:32:16 -07:00
ReceiveStatistics* const rtp_receive_statistics_;
};
} // namespace webrtc
#endif // CALL_RTX_RECEIVE_STREAM_H_