commit ca7ea5f9dc45e3df94e148bc21692b68803de0a0
author philipel <philipel@webrtc.org> Mon Jul 04 14:18:55 2016
committer philipel <philipel@webrtc.org> Mon Jul 04 14:19:11 2016
tree 6c67ffa23f0406873d01598aabaac54b54083608
parent 23ea12e317d7d0546b8cf4dae3d5775daab34f74

FrameObject inherit from VCMEncodedFrame.

Let the FrameObject class inherit from VCMEncodedFrame since the rest of the
decoding pipeline use VCMEncodedFrame.

BUG=webrtc:5514
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/2110543005 .

Cr-Original-Commit-Position: refs/heads/master@{#13380}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 552866c4020adb65a0de569c4f0ed2c6960314b4

modules/video_coding/frame_object.h

diff --git a/modules/video_coding/frame_object.h b/modules/video_coding/frame_object.h
index 02d7342..b0d0d12 100644
--- a/modules/video_coding/frame_object.h
+++ b/modules/video_coding/frame_object.h
@@ -13,11 +13,12 @@
 
 #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 {
+class FrameObject : public webrtc::VCMEncodedFrame {
  public:
   static const uint8_t kMaxFrameReferences = 5;
 
@@ -54,14 +55,14 @@
   uint16_t first_seq_num() const;
   uint16_t last_seq_num() const;
   int times_nacked() const;
-  FrameType frame_type() const;
+  enum FrameType frame_type() const;
   VideoCodecType codec_type() const;
   bool GetBitstream(uint8_t* destination) const override;
   RTPVideoTypeHeader* GetCodecHeader() const;
 
  private:
   PacketBuffer* packet_buffer_;
-  FrameType frame_type_;
+  enum FrameType frame_type_;
   VideoCodecType codec_type_;
   uint16_t first_seq_num_;
   uint16_t last_seq_num_;