rtcp::VoipMetric block moved into own file and got Parse function

webrtc/modules/rtp_rtcp/source/rtcp_packet.h

 /*
  *  Copyright (c) 2014 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.
  *
  */
 
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 namespace rtcp {
 
 static const int kCommonFbFmtLength = 12;
 static const int kReportBlockLength = 24;
 
 class Dlrr;
 class RawPacket;
-class VoipMetric;
 
 // Class for building RTCP packets.
 //
 //  Example:
 //  ReportBlock report_block;
 //  report_block.To(234)
 //  report_block.FractionLost(10);
 //
 //  ReceiverReport rr;
 //  rr.From(123);
@@ skipping 622 matching lines @@
   size_t BlockLength() const {
     const size_t kXrHeaderLength = 8;
     return kXrHeaderLength + RrtrLength() + DlrrLength() + VoipMetricLength();
   }
 
   size_t RrtrLength() const { return Rrtr::kLength * rrtr_blocks_.size(); }
 
   size_t DlrrLength() const;
 
   size_t VoipMetricLength() const {
-    const size_t kVoipMetricBlockLength = 36;
-    return kVoipMetricBlockLength * voip_metric_blocks_.size();
+    return VoipMetric::kLength * voip_metric_blocks_.size();
   }
 
   RTCPUtility::RTCPPacketXR xr_header_;
   std::vector<Rrtr> rrtr_blocks_;
   std::vector<DlrrBlock> dlrr_blocks_;
-  std::vector<RTCPUtility::RTCPPacketXRVOIPMetricItem> voip_metric_blocks_;
+  std::vector<VoipMetric> voip_metric_blocks_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Xr);
 };
 
 // DLRR Report Block (RFC 3611).
 //
 //   0                   1                   2                   3
 //   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
 //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 //  |     BT=5      |   reserved    |         block length          |
@@ skipping 18 matching lines @@
 
  private:
   friend class Xr;
   static const int kMaxNumberOfDlrrItems = 100;
 
   std::vector<RTCPUtility::RTCPPacketXRDLRRReportBlockItem> dlrr_block_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Dlrr);
 };
 
-// VoIP Metrics Report Block (RFC 3611).
-//
-//   0                   1                   2                   3
-//   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |     BT=7      |   reserved    |       block length = 8        |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |                        SSRC of source                         |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |   loss rate   | discard rate  | burst density |  gap density  |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |       burst duration          |         gap duration          |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |     round trip delay          |       end system delay        |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  | signal level  |  noise level  |     RERL      |     Gmin      |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |   R factor    | ext. R factor |    MOS-LQ     |    MOS-CQ     |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |   RX config   |   reserved    |          JB nominal           |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//  |          JB maximum           |          JB abs max           |
-//  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-class VoipMetric {
- public:
-  VoipMetric() {
-    memset(&metric_, 0, sizeof(metric_));
-  }
-  ~VoipMetric() {}
-
-  void To(uint32_t ssrc) { metric_.SSRC = ssrc; }
-  void LossRate(uint8_t loss_rate) { metric_.lossRate = loss_rate; }
-  void DiscardRate(uint8_t discard_rate) { metric_.discardRate = discard_rate; }
-  void BurstDensity(uint8_t burst_density) {
-    metric_.burstDensity = burst_density;
-  }
-  void GapDensity(uint8_t gap_density) { metric_.gapDensity = gap_density; }
-  void BurstDuration(uint16_t burst_duration) {
-    metric_.burstDuration = burst_duration;
-  }
-  void GapDuration(uint16_t gap_duration) {
-    metric_.gapDuration = gap_duration;
-  }
-  void RoundTripDelay(uint16_t round_trip_delay) {
-    metric_.roundTripDelay = round_trip_delay;
-  }
-  void EndSystemDelay(uint16_t end_system_delay) {
-    metric_.endSystemDelay = end_system_delay;
-  }
-  void SignalLevel(uint8_t signal_level) { metric_.signalLevel = signal_level; }
-  void NoiseLevel(uint8_t noise_level) { metric_.noiseLevel = noise_level; }
-  void Rerl(uint8_t rerl) { metric_.RERL = rerl; }
-  void Gmin(uint8_t gmin) { metric_.Gmin = gmin; }
-  void Rfactor(uint8_t rfactor) { metric_.Rfactor = rfactor; }
-  void ExtRfactor(uint8_t extrfactor) { metric_.extRfactor = extrfactor; }
-  void MosLq(uint8_t moslq) { metric_.MOSLQ = moslq; }
-  void MosCq(uint8_t moscq) { metric_.MOSCQ = moscq; }
-  void RxConfig(uint8_t rxconfig) { metric_.RXconfig = rxconfig; }
-  void JbNominal(uint16_t jbnominal) { metric_.JBnominal = jbnominal; }
-  void JbMax(uint16_t jbmax) { metric_.JBmax = jbmax; }
-  void JbAbsMax(uint16_t jbabsmax) { metric_.JBabsMax = jbabsmax; }
-
- private:
-  friend class Xr;
-  RTCPUtility::RTCPPacketXRVOIPMetricItem metric_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(VoipMetric);
-};
-
 // Class holding a RTCP packet.
 //
 // Takes a built rtcp packet.
 //  RawPacket raw_packet(buffer, length);
 //
 // To access the raw packet:
 //  raw_packet.Buffer();         - pointer to the raw packet
 //  raw_packet.BufferLength();   - the length of the raw packet
 
 class RawPacket {
  public:
   explicit RawPacket(size_t buffer_length);
   RawPacket(const uint8_t* packet, size_t packet_length);
 
   const uint8_t* Buffer() const;
   uint8_t* MutableBuffer();
   size_t BufferLength() const;
   size_t Length() const;
   void SetLength(size_t length);
 
  private:
   const size_t buffer_length_;
   size_t length_;
   rtc::scoped_ptr<uint8_t[]> buffer_;
 };
 
 }  // namespace rtcp
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_