Move RTP/RTCP demuxing logic from BaseChannel to RtpTransport.

webrtc/pc/rtcpmuxfilter.cc

 /*
  *  Copyright 2004 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.
  */
 
@@ skipping 90 matching lines @@
   } else if (answer_enable) {
     // If the offer didn't specify RTCP mux, the answer shouldn't either.
     LOG(LS_WARNING) << "Invalid parameters in RTCP mux answer";
     return false;
   } else {
     state_ = ST_INIT;
   }
   return true;
 }
 
-// Check the RTP payload type.  If 63 < payload type < 96, it's RTCP.
-// For additional details, see http://tools.ietf.org/html/rfc5761.
-bool IsRtcp(const char* data, int len) {
-  if (len < 2) {
-    return false;
-  }
-  char pt = data[1] & 0x7F;
-  return (63 < pt) && (pt < 96);
-}
-
-bool RtcpMuxFilter::DemuxRtcp(const char* data, int len) {
-  // If we're muxing RTP/RTCP, we must inspect each packet delivered
-  // and determine whether it is RTP or RTCP. We do so by looking at
-  // the RTP payload type (see IsRtcp).  Note that if we offer RTCP
-  // mux, we may receive muxed RTCP before we receive the answer, so
-  // we operate in that state too.
-  bool offered_mux = ((state_ == ST_SENTOFFER) && offer_enable_);
-  return (IsActive() || offered_mux) && IsRtcp(data, len);
-}
-
 bool RtcpMuxFilter::ExpectOffer(bool offer_enable, ContentSource source) {
   return ((state_ == ST_INIT) ||
           (state_ == ST_ACTIVE && offer_enable == offer_enable_) ||
           (state_ == ST_SENTOFFER && source == CS_LOCAL) ||
           (state_ == ST_RECEIVEDOFFER && source == CS_REMOTE));
 }
 
 bool RtcpMuxFilter::ExpectAnswer(ContentSource source) {
   return ((state_ == ST_SENTOFFER && source == CS_REMOTE) ||
           (state_ == ST_RECEIVEDOFFER && source == CS_LOCAL) ||
           (state_ == ST_SENTPRANSWER && source == CS_LOCAL) ||
           (state_ == ST_RECEIVEDPRANSWER && source == CS_REMOTE));
 }
 
 }  // namespace cricket