Index: webrtc/modules/video_coding/frame_object.h |
diff --git a/webrtc/modules/video_coding/frame_object.h b/webrtc/modules/video_coding/frame_object.h |
index 2a68293d638332ee8799e79201e53de2732bbd8b..180e7c6c304745848655b574b44623fb51a5f27e 100644 |
--- a/webrtc/modules/video_coding/frame_object.h |
+++ b/webrtc/modules/video_coding/frame_object.h |
@@ -11,16 +11,22 @@ |
#ifndef WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ |
#define WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ |
-#include "webrtc/modules/video_coding/packet.h" |
+#include <cstddef> |
stefan-webrtc
2016/04/19 10:38:19
stddef.h is used 65 times in webrtc, cstddef is us
philipel
2016/04/19 11:52:07
Done.
|
+#include <cstdint> |
namespace webrtc { |
namespace video_coding { |
class FrameObject { |
public: |
- virtual uint16_t picture_id() const = 0; |
+ static const uint8_t kMaxFrameReferences = 5; |
+ |
virtual bool GetBitstream(uint8_t* destination) const = 0; |
virtual ~FrameObject() {} |
+ |
+ uint16_t picture_id; |
+ size_t num_references; |
+ uint16_t references[kMaxFrameReferences]; |
stefan-webrtc
2016/04/19 10:38:19
Maybe use a vector instead of a size_t and an arra
|
}; |
class PacketBuffer; |
@@ -28,18 +34,16 @@ class PacketBuffer; |
class RtpFrameObject : public FrameObject { |
public: |
RtpFrameObject(PacketBuffer* packet_buffer, |
- uint16_t picture_id, |
uint16_t first_packet, |
uint16_t last_packet); |
+ |
~RtpFrameObject(); |
uint16_t first_packet() const; |
uint16_t last_packet() const; |
- uint16_t picture_id() const override; |
bool GetBitstream(uint8_t* destination) const override; |
private: |
PacketBuffer* packet_buffer_; |
- uint16_t picture_id_; |
uint16_t first_packet_; |
uint16_t last_packet_; |
}; |