| Index: media/cast/net/rtp/frame_buffer.cc
|
| diff --git a/media/cast/framer/frame_buffer.cc b/media/cast/net/rtp/frame_buffer.cc
|
| similarity index 88%
|
| rename from media/cast/framer/frame_buffer.cc
|
| rename to media/cast/net/rtp/frame_buffer.cc
|
| index 0b6fa8332cdc5f6ab9707d1af79bcbada1620b4c..faf28338e1ae21526c2c7155c66503dc1f577cc6 100644
|
| --- a/media/cast/framer/frame_buffer.cc
|
| +++ b/media/cast/net/rtp/frame_buffer.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/cast/framer/frame_buffer.h"
|
| +#include "media/cast/net/rtp/frame_buffer.h"
|
|
|
| #include "base/logging.h"
|
|
|
| @@ -59,17 +59,17 @@ bool FrameBuffer::Complete() const {
|
| return num_packets_received_ - 1 == max_packet_id_;
|
| }
|
|
|
| -bool FrameBuffer::AssembleEncodedFrame(transport::EncodedFrame* frame) const {
|
| +bool FrameBuffer::AssembleEncodedFrame(EncodedFrame* frame) const {
|
| if (!Complete())
|
| return false;
|
|
|
| // Frame is complete -> construct.
|
| if (is_key_frame_)
|
| - frame->dependency = transport::EncodedFrame::KEY;
|
| + frame->dependency = EncodedFrame::KEY;
|
| else if (frame_id_ == last_referenced_frame_id_)
|
| - frame->dependency = transport::EncodedFrame::INDEPENDENT;
|
| + frame->dependency = EncodedFrame::INDEPENDENT;
|
| else
|
| - frame->dependency = transport::EncodedFrame::DEPENDENT;
|
| + frame->dependency = EncodedFrame::DEPENDENT;
|
| frame->frame_id = frame_id_;
|
| frame->referenced_frame_id = last_referenced_frame_id_;
|
| frame->rtp_timestamp = rtp_timestamp_;
|
|
|