generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set up receiver RTX config using a std::map.

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2014-01-20 14:43:55 +00:00
parent efaeda0c76
commit e02d47515f
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/config.h
View File

@ -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<uint32_t> 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.

7
webrtc/video_receive_stream.h
View File

@ -11,6 +11,7 @@
#ifndef WEBRTC_VIDEO_RECEIVE_STREAM_H_
#define WEBRTC_VIDEO_RECEIVE_STREAM_H_
#include <map>
#include <string>
#include <vector>
@ -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<RtxConfig> rtx;
// RTX settings for video payloads that may be received. RTX is disabled
// if there's no config present.
std::map<int, RtxConfig> rtx;
// RTP header extensions used for the received stream.
std::vector<RtpExtension> extensions;