Removed RtcEventLog deps to call:call_interfaces.

webrtc/logging/rtc_event_log/rtc_event_log_parser.h

 /*
  *  Copyright (c) 2016 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_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_
@@ skipping 56 matching lines @@
     DELAY_BASED_BWE_UPDATE = 7,
     VIDEO_RECEIVER_CONFIG_EVENT = 8,
     VIDEO_SENDER_CONFIG_EVENT = 9,
     AUDIO_RECEIVER_CONFIG_EVENT = 10,
     AUDIO_SENDER_CONFIG_EVENT = 11,
     AUDIO_NETWORK_ADAPTATION_EVENT = 16,
     BWE_PROBE_CLUSTER_CREATED_EVENT = 17,
     BWE_PROBE_RESULT_EVENT = 18
   };
 
+  enum class MediaType { ANY, AUDIO, VIDEO, DATA };
+
   // Reads an RtcEventLog file and returns true if parsing was successful.
   bool ParseFile(const std::string& file_name);
 
   // Reads an RtcEventLog from a string and returns true if successful.
   bool ParseString(const std::string& s);
 
   // Reads an RtcEventLog from an istream and returns true if successful.
   bool ParseStream(std::istream& stream);
 
   // Returns the number of events in an EventStream.
   size_t GetNumberOfEvents() const;
 
   // Reads the arrival timestamp (in microseconds) from a rtclog::Event.
   int64_t GetTimestamp(size_t index) const;
 
   // Reads the event type of the rtclog::Event at |index|.
   EventType GetEventType(size_t index) const;
 
-  // Reads the header, direction, media type, header length and packet length
-  // from the RTP event at |index|, and stores the values in the corresponding
-  // output parameters. Each output parameter can be set to nullptr if that
-  // value isn't needed.
+  // Reads the header, direction, header length and packet length from the RTP
+  // event at |index|, and stores the values in the corresponding output
+  // parameters. Each output parameter can be set to nullptr if that value
+  // isn't needed.
   // NB: The header must have space for at least IP_PACKET_SIZE bytes.
   void GetRtpHeader(size_t index,
                     PacketDirection* incoming,
-                    MediaType* media_type,
                     uint8_t* header,
                     size_t* header_length,
                     size_t* total_length) const;
 
-  // Reads packet, direction, media type and packet length from the RTCP event
-  // at |index|, and stores the values in the corresponding output parameters.
+  // Reads packet, direction and packet length from the RTCP event at |index|,
+  // and stores the values in the corresponding output parameters.
   // Each output parameter can be set to nullptr if that value isn't needed.
   // NB: The packet must have space for at least IP_PACKET_SIZE bytes.
   void GetRtcpPacket(size_t index,
                      PacketDirection* incoming,
-                     MediaType* media_type,
                      uint8_t* packet,
                      size_t* length) const;
 
   // Reads a config event to a (non-NULL) StreamConfig struct.
   // Only the fields that are stored in the protobuf will be written.
+  void GetVideoReceiveConfig(const rtclog::Event& event,

[terelius, 2017/05/30 08:11:19]

Could we make these helper functions private?

[perkj_webrtc, 2017/05/30 10:17:54]

yes

+                             rtclog::StreamConfig* config) const;
   void GetVideoReceiveConfig(size_t index, rtclog::StreamConfig* config) const;
 
   // Reads a config event to a (non-NULL) StreamConfig struct.
   // Only the fields that are stored in the protobuf will be written.
+  void GetVideoSendConfig(const rtclog::Event& event,
+                          rtclog::StreamConfig* config) const;
   void GetVideoSendConfig(size_t index, rtclog::StreamConfig* config) const;
 
   // Reads a config event to a (non-NULL) StreamConfig struct.
   // Only the fields that are stored in the protobuf will be written.
+  void GetAudioReceiveConfig(const rtclog::Event& event,
+                             rtclog::StreamConfig* config) const;
   void GetAudioReceiveConfig(size_t index, rtclog::StreamConfig* config) const;
 
   // Reads a config event to a (non-NULL) StreamConfig struct.
   // Only the fields that are stored in the protobuf will be written.
+  void GetAudioSendConfig(const rtclog::Event& event,
+                          rtclog::StreamConfig* config) const;
   void GetAudioSendConfig(size_t index, rtclog::StreamConfig* config) const;
 
   // Reads the SSRC from the audio playout event at |index|. The SSRC is stored
   // in the output parameter ssrc. The output parameter can be set to nullptr
   // and in that case the function only asserts that the event is well formed.
   void GetAudioPlayout(size_t index, uint32_t* ssrc) const;
 
   // Reads bitrate, fraction loss (as defined in RFC 1889) and total number of
   // expected packets from the loss based BWE event at |index| and stores the
   // values in
@@ skipping 10 matching lines @@
   // parameter can be set to nullptr if that
   // value isn't needed.
   BweDelayBasedUpdate GetDelayBasedBweUpdate(size_t index) const;
 
   // Reads a audio network adaptation event to a (non-NULL)
   // AudioEncoderRuntimeConfig struct. Only the fields that are
   // stored in the protobuf will be written.
   void GetAudioNetworkAdaptation(size_t index,
                                  AudioEncoderRuntimeConfig* config) const;
 
-  ParsedRtcEventLog::BweProbeClusterCreatedEvent GetBweProbeClusterCreated(
-      size_t index) const;
+  BweProbeClusterCreatedEvent GetBweProbeClusterCreated(size_t index) const;
 
-  ParsedRtcEventLog::BweProbeResultEvent GetBweProbeResult(size_t index) const;
+  BweProbeResultEvent GetBweProbeResult(size_t index) const;
+
+  MediaType GetMediaType(uint32_t ssrc, PacketDirection direction) const;
 
  private:
   std::vector<rtclog::Event> events_;
+
+  struct Stream {
+    Stream(uint32_t ssrc,
+           MediaType media_type,
+           webrtc::PacketDirection direction)
+        : ssrc(ssrc), media_type(media_type), direction(direction) {}
+    uint32_t ssrc;
+    MediaType media_type;
+    webrtc::PacketDirection direction;
+  };
+
+  // All configured streams found in the event log.
+  std::vector<Stream> streams_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_