From e02d47515f5506cd6f62050e367ab423338c7c0e Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Mon, 20 Jan 2014 14:43:55 +0000 Subject: [PATCH] Set up receiver RTX config using a std::map. This change removes video_payload_type from RtxConfig as it can be inferred from the map key or config otherwise. Wiring up this config is part of issue 2399. BUG= R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/7349004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5402 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/config.h | 5 +---- webrtc/video_receive_stream.h | 7 ++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/webrtc/config.h b/webrtc/config.h index f42895ae21..62f9fc8559 100644 --- a/webrtc/config.h +++ b/webrtc/config.h @@ -73,15 +73,12 @@ struct FecConfig { // Settings for RTP retransmission payload format, see RFC 4588 for details. struct RtxConfig { - RtxConfig() : rtx_payload_type(0), video_payload_type(0) {} + RtxConfig() : rtx_payload_type(0) {} // SSRCs to use for the RTX streams. std::vector ssrcs; // Payload type to use for the RTX stream. int rtx_payload_type; - - // Original video payload this RTX stream is used for. - int video_payload_type; }; // RTP header extension to use for the video stream, see RFC 5285. diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h index 55e5a626ae..ac1afc694e 100644 --- a/webrtc/video_receive_stream.h +++ b/webrtc/video_receive_stream.h @@ -11,6 +11,7 @@ #ifndef WEBRTC_VIDEO_RECEIVE_STREAM_H_ #define WEBRTC_VIDEO_RECEIVE_STREAM_H_ +#include #include #include @@ -137,9 +138,9 @@ class VideoReceiveStream { // See FecConfig for description. FecConfig fec; - // RTX settings for possible payloads. RTX is disabled if the vector is - // empty. - std::vector rtx; + // RTX settings for video payloads that may be received. RTX is disabled + // if there's no config present. + std::map rtx; // RTP header extensions used for the received stream. std::vector extensions;