FrameObject inherit from VCMEncodedFrame.

webrtc/modules/video_coding/frame_object.cc

Index: webrtc/modules/video_coding/frame_object.cc
diff --git a/webrtc/modules/video_coding/frame_object.cc b/webrtc/modules/video_coding/frame_object.cc
index b46f8169660bd2f53f09095b0592f19e704eac7c..c33fdf749b81b908fab9c29497c4d61308692c44 100644
--- a/webrtc/modules/video_coding/frame_object.cc
+++ b/webrtc/modules/video_coding/frame_object.cc
@@ -34,8 +34,25 @@ RtpFrameObject::RtpFrameObject(PacketBuffer* packet_buffer,
   size = frame_size;
   VCMPacket* packet = packet_buffer_->GetPacket(first_seq_num);
   if (packet) {
+    // TODO(philipel): Remove when encoded image is replaced by FrameObject.
+    // VCMEncodedFrame members
+    CopyCodecSpecific(&packet->video_header);
+    _completeFrame = true;
+    _payloadType = packet->payloadType;
+    _timeStamp = packet->timestamp;
+    ntp_time_ms_ = packet->ntp_time_ms_;
+    _buffer = new uint8_t[frame_size]();
+    _size = frame_size;
+    _length = frame_size;
+    _frameType = packet->frameType;
+    GetBitstream(_buffer);
+
+    // RtpFrameObject members
     frame_type_ = packet->frameType;
     codec_type_ = packet->codec;
+
+    // FrameObject members
+    timestamp = packet->timestamp;
   }
 }