Added various timestamps to FrameObject.

webrtc/modules/video_coding/frame_object.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_MODULES_VIDEO_CODING_FRAME_OBJECT_H_
 #define WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_
 
 #include "webrtc/common_types.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/video_coding/encoded_frame.h"
 
 namespace webrtc {
 namespace video_coding {
 
 class FrameObject : public webrtc::VCMEncodedFrame {
  public:
   static const uint8_t kMaxFrameReferences = 5;
 
   FrameObject();
 
   virtual bool GetBitstream(uint8_t* destination) const = 0;
+  virtual uint32_t Timestamp() const = 0;

[terelius, 2016/07/07 16:12:30]

Which timestamp is this? From the RTP header? Please add a comment.

[philipel, 2016/07/08 09:41:19]

Done.

+  virtual int64_t ReceivedTimestamp() const = 0;
+  virtual int64_t RenderTimestamp() const = 0;

[stefan-webrtc, 2016/07/08 10:33:39]

I'd prefer if we don't overuse the word timestamp as it is tightly connected to
the RTP timestamp. Can we instead use RenderTime and ReceivedTime()? Maybe
ReceivedTime should be called CompleteTime instead?

[philipel, 2016/07/08 11:10:50]

Done.

   virtual ~FrameObject() {}
 
   // The tuple (|picture_id|, |spatial_layer|) uniquely identifies a frame
   // object. For codec types that don't necessarily have picture ids they
   // have to be constructed from the header data relevant to that codec.
   uint16_t picture_id;
   uint8_t spatial_layer;
   uint32_t timestamp;
 
   size_t num_references;
   uint16_t references[kMaxFrameReferences];
   bool inter_layer_predicted;
 
   size_t size;
 };
 
 class PacketBuffer;
 
 class RtpFrameObject : public FrameObject {
  public:
   RtpFrameObject(PacketBuffer* packet_buffer,
                  uint16_t first_seq_num,
                  uint16_t last_seq_num,
                  size_t frame_size,
-                 int times_nacked);
+                 int times_nacked,
+                 int64_t frame_completed_timestamp);

[terelius, 2016/07/07 16:12:30]

Different name in the implementation.

[philipel, 2016/07/08 09:41:19]

Fixed.

 
   ~RtpFrameObject();
   uint16_t first_seq_num() const;
   uint16_t last_seq_num() const;
   int times_nacked() const;
   enum FrameType frame_type() const;
   VideoCodecType codec_type() const;
   bool GetBitstream(uint8_t* destination) const override;
+  uint32_t Timestamp() const override;
+  int64_t ReceivedTimestamp() const override;
+  int64_t RenderTimestamp() const override;
   RTPVideoTypeHeader* GetCodecHeader() const;
 
  private:
   PacketBuffer* packet_buffer_;
   enum FrameType frame_type_;
   VideoCodecType codec_type_;
   uint16_t first_seq_num_;
   uint16_t last_seq_num_;
+  uint32_t timestamp_;
+  int64_t received_timestamp_;
 
   // Equal to times nacked of the packet with the highet times nacked
   // belonging to this frame.
   int times_nacked_;
 };
 
 }  // namespace video_coding
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_