| 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 fe3b2b02951aec241173e80aebe791f1e0a8d11a..0df441088134912798bcc487e40f589b2bc1b5d3 100644
|
| --- a/webrtc/modules/video_coding/frame_object.cc
|
| +++ b/webrtc/modules/video_coding/frame_object.cc
|
| @@ -33,7 +33,6 @@ RtpFrameObject::RtpFrameObject(PacketBuffer* packet_buffer,
|
| last_seq_num_(last_seq_num),
|
| received_time_(received_time),
|
| times_nacked_(times_nacked) {
|
| - size = frame_size;
|
| VCMPacket* packet = packet_buffer_->GetPacket(first_seq_num);
|
| if (packet) {
|
| // TODO(philipel): Remove when encoded image is replaced by FrameObject.
|
| @@ -47,7 +46,7 @@ RtpFrameObject::RtpFrameObject(PacketBuffer* packet_buffer,
|
| _size = frame_size;
|
| _length = frame_size;
|
| _frameType = packet->frameType;
|
| - GetBitstream(_buffer);
|
| + packet_buffer_->GetBitstream(*this, _buffer);
|
|
|
| // RtpFrameObject members
|
| frame_type_ = packet->frameType;
|
| @@ -82,10 +81,6 @@ VideoCodecType RtpFrameObject::codec_type() const {
|
| return codec_type_;
|
| }
|
|
|
| -bool RtpFrameObject::GetBitstream(uint8_t* destination) const {
|
| - return packet_buffer_->GetBitstream(*this, destination);
|
| -}
|
| -
|
| uint32_t RtpFrameObject::Timestamp() const {
|
| return timestamp_;
|
| }
|
|
|