Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1212)

Unified Diff: media/cast/framer/frame_buffer.cc

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/framer/frame_buffer.h ('k') | media/cast/framer/frame_buffer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/framer/frame_buffer.cc
diff --git a/media/cast/framer/frame_buffer.cc b/media/cast/framer/frame_buffer.cc
deleted file mode 100644
index 0b6fa8332cdc5f6ab9707d1af79bcbada1620b4c..0000000000000000000000000000000000000000
--- a/media/cast/framer/frame_buffer.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// 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 "base/logging.h"
-
-namespace media {
-namespace cast {
-
-FrameBuffer::FrameBuffer()
- : frame_id_(0),
- max_packet_id_(0),
- num_packets_received_(0),
- is_key_frame_(false),
- total_data_size_(0),
- last_referenced_frame_id_(0),
- packets_() {}
-
-FrameBuffer::~FrameBuffer() {}
-
-void FrameBuffer::InsertPacket(const uint8* payload_data,
- size_t payload_size,
- const RtpCastHeader& rtp_header) {
- // Is this the first packet in the frame?
- if (packets_.empty()) {
- frame_id_ = rtp_header.frame_id;
- max_packet_id_ = rtp_header.max_packet_id;
- is_key_frame_ = rtp_header.is_key_frame;
- if (is_key_frame_)
- DCHECK_EQ(rtp_header.frame_id, rtp_header.reference_frame_id);
- last_referenced_frame_id_ = rtp_header.reference_frame_id;
- rtp_timestamp_ = rtp_header.rtp_timestamp;
- }
- // Is this the correct frame?
- if (rtp_header.frame_id != frame_id_)
- return;
-
- // Insert every packet only once.
- if (packets_.find(rtp_header.packet_id) != packets_.end()) {
- return;
- }
-
- std::vector<uint8> data;
- std::pair<PacketMap::iterator, bool> retval =
- packets_.insert(make_pair(rtp_header.packet_id, data));
-
- // Insert the packet.
- retval.first->second.resize(payload_size);
- std::copy(
- 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 {
- if (!Complete())
- return false;
-
- // Frame is complete -> construct.
- if (is_key_frame_)
- frame->dependency = transport::EncodedFrame::KEY;
- else if (frame_id_ == last_referenced_frame_id_)
- frame->dependency = transport::EncodedFrame::INDEPENDENT;
- else
- frame->dependency = transport::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
« no previous file with comments | « media/cast/framer/frame_buffer.h ('k') | media/cast/framer/frame_buffer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698