Cast: Reshuffle files under media/cast

media/cast/net/rtp/frame_buffer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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"
 
 namespace media {
 namespace cast {
 
 FrameBuffer::FrameBuffer()
     : frame_id_(0),
       max_packet_id_(0),
       num_packets_received_(0),
@@ skipping 36 matching lines @@
       payload_data, payload_data + payload_size, retval.first->second.begin());
 
   ++num_packets_received_;
   total_data_size_ += payload_size;
 }
 
 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_;
 
   // Build the data vector.
   frame->data.clear();
   frame->data.reserve(total_data_size_);
   PacketMap::const_iterator it;
   for (it = packets_.begin(); it != packets_.end(); ++it)
     frame->data.insert(frame->data.end(), it->second.begin(), it->second.end());
   return true;
 }
 
 }  // namespace cast
 }  // namespace media