Cast: Implemented relative RTP timestamp in EncodingEventSubscriber.

media/cast/logging/encoding_event_subscriber.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CAST_LOGGING_ENCODING_EVENT_SUBSCRIBER_H_
 #define MEDIA_CAST_LOGGING_ENCODING_EVENT_SUBSCRIBER_H_
 
 #include <map>
 
 #include "base/memory/linked_ptr.h"
@@ skipping 28 matching lines @@
   EncodingEventSubscriber(EventMediaType event_media_type, size_t max_frames);
 
   virtual ~EncodingEventSubscriber();
 
   // RawReventSubscriber implementations.
   virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE;
   virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE;
   virtual void OnReceiveGenericEvent(const GenericEvent& generic_event)
       OVERRIDE;
 
-  // Assigns frame events received so far to |frame_events| and clears them
-  // from this object.
-  void GetFrameEventsAndReset(FrameEventMap* frame_events);
-
-  // Assigns packet events received so far to |packet_events| and clears them
-  // from this object.
-  void GetPacketEventsAndReset(PacketEventMap* packet_events);
+  // Assigns frame events and packet events received so far to |frame_events|
+  // and clears them |packet_events| respectively, assigns the first seen RTP
+  // timestamp (which is used as a reference for all event entries) to
+  // |first_rtp_timestamp|, and reset this object's internal states.
+  // All RTP timestamp values returned in the maps are relative to
+  // |first_rtp_timestamp|, i.e. suppose |first_rtp_timestamp| is X,
+  // then the first event will be recorded with a relative
+  // RTP timestamp value of 0. If the next event has original RTP timestamp
+  // X+20, it will be recorded with a relative RTP timestamp of 20.
+  void GetEventsAndReset(FrameEventMap* frame_events,
+                         PacketEventMap* packet_events,
+                         RtpTimestamp* first_rtp_timestamp);
 
  private:
   bool ShouldProcessEvent(CastLoggingEvent event);
 
   // Removes oldest entry from |frame_event_map_| (ordered by RTP timestamp).
   void TruncateFrameEventMapIfNeeded();
 
   // Removes oldest entry from |packet_event_map_| (ordered by RTP timestamp).
   void TruncatePacketEventMapIfNeeded();
 
+  // Returns the difference between |rtp_timestamp| and |first_rtp_timestamp_|.
+  // Sets |first_rtp_timestamp_| if it is not already set.
+  RtpTimestamp GetRelativeRtpTimestamp(RtpTimestamp rtp_timestamp);
+
+  // Clears the maps and first RTP timestamp seen.
+  void Reset();
+
   const EventMediaType event_media_type_;
   const size_t max_frames_;
 
   FrameEventMap frame_event_map_;
   PacketEventMap packet_event_map_;
 
   // All functions must be called on the main thread.
   base::ThreadChecker thread_checker_;
 
+  // Set to true on first event encountered after a |Reset()|.
+  bool seen_first_rtp_timestamp_;
+  // Set to RTP timestamp of first event encountered after a |Reset()|.

[Alpha Left Google, 2014/02/18 21:54:28]

nit: an empty line before this.

[imcheng, 2014/02/19 01:12:27]

Done.

+  RtpTimestamp first_rtp_timestamp_;
+
   DISALLOW_COPY_AND_ASSIGN(EncodingEventSubscriber);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_LOGGING_ENCODING_EVENT_SUBSCRIBER_H_