diff options
author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-19 14:56:59 +0000 |
---|---|---|
committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-19 14:56:59 +0000 |
commit | e9db8f6d27d05dcf0f549ee0a1266c7374154f59 (patch) | |
tree | cfaf434191603951274e05b63439e4f02390f9b2 /media/base/mediachannel.h | |
parent | b095dd14ed4fe610c12a9fffd28b3bdab5ee7b8c (diff) | |
download | talk-e9db8f6d27d05dcf0f549ee0a1266c7374154f59.tar.gz |
(Auto)update libjingle 73399579-> 73626167
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6928 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/mediachannel.h')
-rw-r--r-- | media/base/mediachannel.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h index 3759acc..782973f 100644 --- a/media/base/mediachannel.h +++ b/media/base/mediachannel.h @@ -182,7 +182,6 @@ struct AudioOptions { recording_sample_rate.SetFrom(change.recording_sample_rate); playout_sample_rate.SetFrom(change.playout_sample_rate); dscp.SetFrom(change.dscp); - opus_fec.SetFrom(change.opus_fec); } bool operator==(const AudioOptions& o) const { @@ -208,8 +207,7 @@ struct AudioOptions { rx_agc_limiter == o.rx_agc_limiter && recording_sample_rate == o.recording_sample_rate && playout_sample_rate == o.playout_sample_rate && - dscp == o.dscp && - opus_fec == o.opus_fec; + dscp == o.dscp; } std::string ToString() const { @@ -240,7 +238,6 @@ struct AudioOptions { ost << ToStringIfSet("recording_sample_rate", recording_sample_rate); ost << ToStringIfSet("playout_sample_rate", playout_sample_rate); ost << ToStringIfSet("dscp", dscp); - ost << ToStringIfSet("opus_fec", opus_fec); ost << "}"; return ost.str(); } @@ -278,8 +275,6 @@ struct AudioOptions { Settable<uint32> playout_sample_rate; // Set DSCP value for packet sent from audio channel. Settable<bool> dscp; - // Set Opus FEC - Settable<bool> opus_fec; }; // Options that can be applied to a VideoMediaChannel or a VideoMediaEngine. |