2011-07-07 08:21:25 +00:00
|
|
|
/*
|
2012-03-01 18:22:48 +00:00
|
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
2011-07-07 08:21:25 +00:00
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#ifndef VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
|
|
|
|
|
#define VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2011-10-13 15:19:55 +00:00
|
|
|
#include <list>
|
2016-11-15 00:57:57 -08:00
|
|
|
#include <map>
|
2016-03-01 11:52:33 -08:00
|
|
|
#include <memory>
|
2016-02-26 16:26:20 +01:00
|
|
|
#include <string>
|
2015-11-26 15:24:52 +01:00
|
|
|
#include <vector>
|
2011-10-13 15:19:55 +00:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "call/rtp_packet_sink_interface.h"
|
|
|
|
|
#include "call/video_receive_stream.h"
|
|
|
|
|
#include "modules/include/module_common_types.h"
|
|
|
|
|
#include "modules/rtp_rtcp/include/receive_statistics.h"
|
|
|
|
|
#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
|
2017-09-25 10:47:00 +02:00
|
|
|
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
|
2017-10-25 13:07:09 +02:00
|
|
|
#include "modules/rtp_rtcp/include/rtp_payload_registry.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp.h"
|
|
|
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
|
|
|
#include "modules/video_coding/h264_sps_pps_tracker.h"
|
|
|
|
|
#include "modules/video_coding/include/video_coding_defines.h"
|
|
|
|
|
#include "modules/video_coding/packet_buffer.h"
|
|
|
|
|
#include "modules/video_coding/rtp_frame_reference_finder.h"
|
|
|
|
|
#include "rtc_base/constructormagic.h"
|
|
|
|
|
#include "rtc_base/criticalsection.h"
|
2017-10-25 13:07:09 +02:00
|
|
|
#include "rtc_base/numerics/sequence_number_util.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/sequenced_task_checker.h"
|
2017-09-15 13:58:09 +02:00
|
|
|
#include "typedefs.h" // NOLINT(build/include)
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2011-11-28 22:39:24 +00:00
|
|
|
namespace webrtc {
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2016-11-15 00:57:57 -08:00
|
|
|
class NackModule;
|
2016-04-25 01:26:26 -07:00
|
|
|
class PacedSender;
|
|
|
|
|
class PacketRouter;
|
2016-05-06 05:32:22 -07:00
|
|
|
class ProcessThread;
|
2013-08-15 23:38:54 +00:00
|
|
|
class ReceiveStatistics;
|
2016-05-03 21:22:04 -07:00
|
|
|
class ReceiveStatisticsProxy;
|
2016-11-15 00:57:57 -08:00
|
|
|
class RemoteNtpTimeEstimator;
|
2016-04-25 01:26:26 -07:00
|
|
|
class RtcpRttStats;
|
2013-05-29 12:12:51 +00:00
|
|
|
class RtpHeaderParser;
|
2017-02-13 05:59:46 -08:00
|
|
|
class RtpPacketReceived;
|
2013-08-15 23:38:54 +00:00
|
|
|
class RTPPayloadRegistry;
|
|
|
|
|
class RtpReceiver;
|
2016-04-25 01:26:26 -07:00
|
|
|
class Transport;
|
2016-10-31 04:51:33 -07:00
|
|
|
class UlpfecReceiver;
|
2016-11-15 00:57:57 -08:00
|
|
|
class VCMTiming;
|
2016-04-22 18:23:15 +02:00
|
|
|
|
|
|
|
|
namespace vcm {
|
|
|
|
|
class VideoReceiver;
|
|
|
|
|
} // namespace vcm
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2017-06-09 04:01:55 -07:00
|
|
|
class RtpVideoStreamReceiver : public RtpData,
|
|
|
|
|
public RecoveredPacketReceiver,
|
|
|
|
|
public RtpFeedback,
|
2017-06-21 01:05:22 -07:00
|
|
|
public RtpPacketSinkInterface,
|
2017-06-09 04:01:55 -07:00
|
|
|
public VCMFrameTypeCallback,
|
|
|
|
|
public VCMPacketRequestCallback,
|
|
|
|
|
public video_coding::OnReceivedFrameCallback,
|
|
|
|
|
public video_coding::OnCompleteFrameCallback,
|
|
|
|
|
public CallStatsObserver {
|
2011-11-28 22:39:24 +00:00
|
|
|
public:
|
2017-06-09 04:01:55 -07:00
|
|
|
RtpVideoStreamReceiver(
|
2016-11-15 00:57:57 -08:00
|
|
|
Transport* transport,
|
|
|
|
|
RtcpRttStats* rtt_stats,
|
|
|
|
|
PacketRouter* packet_router,
|
|
|
|
|
const VideoReceiveStream::Config* config,
|
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* rtp_receive_statistics,
|
2016-11-15 00:57:57 -08:00
|
|
|
ReceiveStatisticsProxy* receive_stats_proxy,
|
|
|
|
|
ProcessThread* process_thread,
|
|
|
|
|
NackSender* nack_sender,
|
|
|
|
|
KeyFrameRequestSender* keyframe_request_sender,
|
|
|
|
|
video_coding::OnCompleteFrameCallback* complete_frame_callback,
|
|
|
|
|
VCMTiming* timing);
|
2017-06-09 04:01:55 -07:00
|
|
|
~RtpVideoStreamReceiver();
|
2011-11-28 22:39:24 +00:00
|
|
|
|
2016-12-20 04:15:59 -08:00
|
|
|
bool AddReceiveCodec(const VideoCodec& video_codec,
|
|
|
|
|
const std::map<std::string, std::string>& codec_params);
|
2013-08-15 23:38:54 +00:00
|
|
|
uint32_t GetRemoteSsrc() const;
|
|
|
|
|
int GetCsrcs(uint32_t* csrcs) const;
|
|
|
|
|
|
|
|
|
|
RtpReceiver* GetRtpReceiver() const;
|
2016-04-25 01:26:26 -07:00
|
|
|
RtpRtcp* rtp_rtcp() const { return rtp_rtcp_.get(); }
|
2013-08-15 23:38:54 +00:00
|
|
|
|
2011-11-28 22:39:24 +00:00
|
|
|
void StartReceive();
|
|
|
|
|
void StopReceive();
|
|
|
|
|
|
2016-02-08 14:07:14 +01:00
|
|
|
bool DeliverRtcp(const uint8_t* rtcp_packet, size_t rtcp_packet_length);
|
2011-11-28 22:39:24 +00:00
|
|
|
|
2017-09-04 07:03:46 -07:00
|
|
|
void FrameContinuous(int64_t seq_num);
|
2016-11-15 00:57:57 -08:00
|
|
|
|
2017-09-04 07:03:46 -07:00
|
|
|
void FrameDecoded(int64_t seq_num);
|
2016-11-15 00:57:57 -08:00
|
|
|
|
2016-05-06 05:32:22 -07:00
|
|
|
void SignalNetworkState(NetworkState state);
|
|
|
|
|
|
2017-06-21 01:05:22 -07:00
|
|
|
// Implements RtpPacketSinkInterface.
|
|
|
|
|
void OnRtpPacket(const RtpPacketReceived& packet) override;
|
2017-02-13 05:59:46 -08:00
|
|
|
|
2011-11-28 22:39:24 +00:00
|
|
|
// Implements RtpData.
|
2015-03-04 12:58:35 +00:00
|
|
|
int32_t OnReceivedPayloadData(const uint8_t* payload_data,
|
2016-06-14 12:52:54 +02:00
|
|
|
size_t payload_size,
|
2015-03-04 12:58:35 +00:00
|
|
|
const WebRtcRTPHeader* rtp_header) override;
|
2017-05-29 08:16:37 -07:00
|
|
|
// Implements RecoveredPacketReceiver.
|
|
|
|
|
void OnRecoveredPacket(const uint8_t* packet, size_t packet_length) override;
|
2011-11-28 22:39:24 +00:00
|
|
|
|
2016-04-28 23:15:33 -07:00
|
|
|
// Implements RtpFeedback.
|
2017-10-04 12:38:53 +02:00
|
|
|
int32_t OnInitializeDecoder(int payload_type,
|
|
|
|
|
const SdpAudioFormat& audio_format,
|
2016-07-28 15:19:10 -07:00
|
|
|
uint32_t rate) override;
|
2017-06-09 06:12:11 -07:00
|
|
|
void OnIncomingSSRCChanged(uint32_t ssrc) override {}
|
2016-07-28 15:19:10 -07:00
|
|
|
void OnIncomingCSRCChanged(uint32_t CSRC, bool added) override {}
|
2016-04-28 23:15:33 -07:00
|
|
|
|
2016-05-03 21:22:04 -07:00
|
|
|
// Implements VCMFrameTypeCallback.
|
|
|
|
|
int32_t RequestKeyFrame() override;
|
|
|
|
|
|
2016-12-08 08:25:47 -08:00
|
|
|
bool IsUlpfecEnabled() const;
|
2016-05-06 05:32:22 -07:00
|
|
|
bool IsRetransmissionsEnabled() const;
|
|
|
|
|
// Don't use, still experimental.
|
|
|
|
|
void RequestPacketRetransmit(const std::vector<uint16_t>& sequence_numbers);
|
|
|
|
|
|
2016-05-03 21:22:04 -07:00
|
|
|
// Implements VCMPacketRequestCallback.
|
|
|
|
|
int32_t ResendPackets(const uint16_t* sequenceNumbers,
|
|
|
|
|
uint16_t length) override;
|
2015-11-26 15:24:52 +01:00
|
|
|
|
2016-11-15 00:57:57 -08:00
|
|
|
// Implements OnReceivedFrameCallback.
|
|
|
|
|
void OnReceivedFrame(
|
|
|
|
|
std::unique_ptr<video_coding::RtpFrameObject> frame) override;
|
|
|
|
|
|
|
|
|
|
// Implements OnCompleteFrameCallback.
|
|
|
|
|
void OnCompleteFrame(
|
|
|
|
|
std::unique_ptr<video_coding::FrameObject> frame) override;
|
|
|
|
|
|
|
|
|
|
void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
|
|
|
|
|
|
2017-05-18 08:08:53 -07:00
|
|
|
rtc::Optional<int64_t> LastReceivedPacketMs() const;
|
|
|
|
|
rtc::Optional<int64_t> LastReceivedKeyframePacketMs() const;
|
|
|
|
|
|
2017-08-02 07:39:07 -07:00
|
|
|
// RtpDemuxer only forwards a given RTP packet to one sink. However, some
|
|
|
|
|
// sinks, such as FlexFEC, might wish to be informed of all of the packets
|
|
|
|
|
// a given sink receives (or any set of sinks). They may do so by registering
|
|
|
|
|
// themselves as secondary sinks.
|
|
|
|
|
void AddSecondarySink(RtpPacketSinkInterface* sink);
|
|
|
|
|
void RemoveSecondarySink(const RtpPacketSinkInterface* sink);
|
|
|
|
|
|
2011-11-28 22:39:24 +00:00
|
|
|
private:
|
2017-01-25 07:37:27 -08:00
|
|
|
bool AddReceiveCodec(const VideoCodec& video_codec);
|
2017-05-29 08:16:37 -07:00
|
|
|
void ReceivePacket(const uint8_t* packet,
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t packet_length,
|
2017-10-05 08:39:15 +02:00
|
|
|
const RTPHeader& header);
|
2013-09-06 13:40:11 +00:00
|
|
|
// Parses and handles for instance RTX and RED headers.
|
|
|
|
|
// This function assumes that it's being called from only one thread.
|
2017-05-29 08:16:37 -07:00
|
|
|
void ParseAndHandleEncapsulatingHeader(const uint8_t* packet,
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t packet_length,
|
2013-09-06 13:40:11 +00:00
|
|
|
const RTPHeader& header);
|
2015-01-28 13:58:27 +00:00
|
|
|
void NotifyReceiverOfFecPacket(const RTPHeader& header);
|
2013-09-06 13:40:11 +00:00
|
|
|
bool IsPacketInOrder(const RTPHeader& header) const;
|
2013-11-08 15:18:52 +00:00
|
|
|
bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
|
2015-01-15 07:40:20 +00:00
|
|
|
void UpdateHistograms();
|
Remove RED/RTX workaround from sender/receiver and VideoEngine2.
In older Chrome versions, the associated payload type in the RTX header
of retransmitted packets was always set to be the original media payload type,
regardless of the actual payload type of the packet. This meant that packets
encapsulated with RED headers had incorrect payload type information in the
RTX header. Due to an assumption in the receiver, this incorrect payload type
information would effectively be undone, leading to a working system.
Albeit working, this behaviour was undesired, and thus removed. In the interim,
several workarounds were introduced to not destroy interop between old and
new Chrome versions:
(1) https://codereview.webrtc.org/1649493004
- If no payload type mapping existed for RED over RTX, the payload type
of the underlying media would be used.
- If RED had been negotiated, received RTX packets would always be
assumed to contain RED.
(2) https://codereview.webrtc.org/1964473002
- If RED was removed from the remote description answer, it would be
disabled in the local receiver as well.
(3) https://codereview.webrtc.org/2033763002
- If RED was negotiated in the SDP, it would always be used, regardless
if ULPFEC was negotiated and used, or not.
Since the Chrome versions that exhibited the original bug now are very old,
this CL removes the workarounds from (1) and (2). In particular, after this
change, we will have the following behaviour:
- We assume that a payload type mapping for RED over RTX always is set.
If this is not the case, the RTX packet is not sent.
- The associated payload type of received RTX packets will always be obeyed.
- The (non)-existence of RED in the remote description does not affect the
local receiver.
The workaround in (3) still needs to exist, in order to interop with receivers
that did not have the workarounds in (1) and (2) removed. The change in (3)
can be removed in a couple of Chrome versions.
TESTED=Using AppRTC between patched Chrome (connected to ethernet) and standard Chrome M54 (connected to lossy internal Google WiFi), with and without FEC turned off using AppRTC flag. Also using "Munge SDP" sample on patched Chrome over loopback interface, with 100ms delay and 5% packet loss simulated using tc.
BUG=webrtc:6650
Review-Url: https://codereview.webrtc.org/2469093003
Cr-Commit-Position: refs/heads/master@{#15038}
2016-11-11 03:28:30 -08:00
|
|
|
bool IsRedEnabled() const;
|
2016-12-20 04:15:59 -08:00
|
|
|
void InsertSpsPpsIntoTracker(uint8_t payload_type);
|
2011-11-28 22:39:24 +00:00
|
|
|
|
2016-03-02 15:05:53 +01:00
|
|
|
Clock* const clock_;
|
2016-06-10 17:58:01 +02:00
|
|
|
// Ownership of this object lies with VideoReceiveStream, which owns |this|.
|
|
|
|
|
const VideoReceiveStream::Config& config_;
|
2016-04-25 01:26:26 -07:00
|
|
|
PacketRouter* const packet_router_;
|
2016-05-06 05:32:22 -07:00
|
|
|
ProcessThread* const process_thread_;
|
2016-03-02 15:05:53 +01:00
|
|
|
|
|
|
|
|
RemoteNtpTimeEstimator ntp_estimator_;
|
|
|
|
|
RTPPayloadRegistry rtp_payload_registry_;
|
|
|
|
|
|
2017-09-25 10:47:00 +02:00
|
|
|
RtpHeaderExtensionMap rtp_header_extensions_;
|
2016-03-02 15:05:53 +01:00
|
|
|
const std::unique_ptr<RtpReceiver> rtp_receiver_;
|
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_;
|
2016-10-31 04:51:33 -07:00
|
|
|
std::unique_ptr<UlpfecReceiver> ulpfec_receiver_;
|
2014-04-24 22:10:24 +00:00
|
|
|
|
2017-08-25 00:49:08 -07:00
|
|
|
rtc::SequencedTaskChecker worker_task_checker_;
|
2017-09-09 04:17:22 -07:00
|
|
|
bool receiving_ RTC_GUARDED_BY(worker_task_checker_);
|
|
|
|
|
int64_t last_packet_log_ms_ RTC_GUARDED_BY(worker_task_checker_);
|
2016-04-25 01:26:26 -07:00
|
|
|
|
|
|
|
|
const std::unique_ptr<RtpRtcp> rtp_rtcp_;
|
2016-11-15 00:57:57 -08:00
|
|
|
|
|
|
|
|
// Members for the new jitter buffer experiment.
|
|
|
|
|
video_coding::OnCompleteFrameCallback* complete_frame_callback_;
|
|
|
|
|
KeyFrameRequestSender* keyframe_request_sender_;
|
|
|
|
|
VCMTiming* timing_;
|
|
|
|
|
std::unique_ptr<NackModule> nack_module_;
|
|
|
|
|
rtc::scoped_refptr<video_coding::PacketBuffer> packet_buffer_;
|
|
|
|
|
std::unique_ptr<video_coding::RtpFrameReferenceFinder> reference_finder_;
|
|
|
|
|
rtc::CriticalSection last_seq_num_cs_;
|
2017-09-04 07:03:46 -07:00
|
|
|
std::map<int64_t, uint16_t> last_seq_num_for_pic_id_
|
2017-09-09 04:17:22 -07:00
|
|
|
RTC_GUARDED_BY(last_seq_num_cs_);
|
2016-11-15 00:57:57 -08:00
|
|
|
video_coding::H264SpsPpsTracker tracker_;
|
2016-12-20 04:15:59 -08:00
|
|
|
// TODO(johan): Remove pt_codec_params_ once
|
|
|
|
|
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6883 is resolved.
|
|
|
|
|
// Maps a payload type to a map of out-of-band supplied codec parameters.
|
|
|
|
|
std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_;
|
|
|
|
|
int16_t last_payload_type_ = -1;
|
2017-05-16 08:06:30 -07:00
|
|
|
|
|
|
|
|
bool has_received_frame_;
|
2017-08-02 07:39:07 -07:00
|
|
|
|
2017-08-25 00:49:08 -07:00
|
|
|
std::vector<RtpPacketSinkInterface*> secondary_sinks_
|
2017-09-09 04:17:22 -07:00
|
|
|
RTC_GUARDED_BY(worker_task_checker_);
|
2011-07-07 08:21:25 +00:00
|
|
|
};
|
2011-11-28 22:39:24 +00:00
|
|
|
|
2015-11-26 15:24:52 +01:00
|
|
|
} // namespace webrtc
|
2011-11-28 22:39:24 +00:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#endif // VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
|