| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/cast/framer/framer.h" | 5 #include "media/cast/net/rtp/framer.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 | 8 |
| 9 namespace media { | 9 namespace media { |
| 10 namespace cast { | 10 namespace cast { |
| 11 | 11 |
| 12 typedef FrameList::const_iterator ConstFrameIterator; | 12 typedef FrameList::const_iterator ConstFrameIterator; |
| 13 | 13 |
| 14 Framer::Framer(base::TickClock* clock, | 14 Framer::Framer(base::TickClock* clock, |
| 15 RtpPayloadFeedback* incoming_payload_feedback, | 15 RtpPayloadFeedback* incoming_payload_feedback, |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 frames_.insert(std::make_pair(rtp_header.frame_id, frame_buffer)); | 55 frames_.insert(std::make_pair(rtp_header.frame_id, frame_buffer)); |
| 56 } else { | 56 } else { |
| 57 // Insert packet to existing frame buffer. | 57 // Insert packet to existing frame buffer. |
| 58 it->second->InsertPacket(payload_data, payload_size, rtp_header); | 58 it->second->InsertPacket(payload_data, payload_size, rtp_header); |
| 59 } | 59 } |
| 60 | 60 |
| 61 return packet_type == kNewPacketCompletingFrame; | 61 return packet_type == kNewPacketCompletingFrame; |
| 62 } | 62 } |
| 63 | 63 |
| 64 // This does not release the frame. | 64 // This does not release the frame. |
| 65 bool Framer::GetEncodedFrame(transport::EncodedFrame* frame, | 65 bool Framer::GetEncodedFrame(EncodedFrame* frame, |
| 66 bool* next_frame, | 66 bool* next_frame, |
| 67 bool* have_multiple_decodable_frames) { | 67 bool* have_multiple_decodable_frames) { |
| 68 *have_multiple_decodable_frames = frame_id_map_.HaveMultipleDecodableFrames(); | 68 *have_multiple_decodable_frames = frame_id_map_.HaveMultipleDecodableFrames(); |
| 69 | 69 |
| 70 uint32 frame_id; | 70 uint32 frame_id; |
| 71 // Find frame id. | 71 // Find frame id. |
| 72 if (frame_id_map_.NextContinuousFrame(&frame_id)) { | 72 if (frame_id_map_.NextContinuousFrame(&frame_id)) { |
| 73 // We have our next frame. | 73 // We have our next frame. |
| 74 *next_frame = true; | 74 *next_frame = true; |
| 75 } else { | 75 } else { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 } | 123 } |
| 124 | 124 |
| 125 bool Framer::TimeToSendNextCastMessage(base::TimeTicks* time_to_send) { | 125 bool Framer::TimeToSendNextCastMessage(base::TimeTicks* time_to_send) { |
| 126 return cast_msg_builder_->TimeToSendNextCastMessage(time_to_send); | 126 return cast_msg_builder_->TimeToSendNextCastMessage(time_to_send); |
| 127 } | 127 } |
| 128 | 128 |
| 129 void Framer::SendCastMessage() { cast_msg_builder_->UpdateCastMessage(); } | 129 void Framer::SendCastMessage() { cast_msg_builder_->UpdateCastMessage(); } |
| 130 | 130 |
| 131 } // namespace cast | 131 } // namespace cast |
| 132 } // namespace media | 132 } // namespace media |
| OLD | NEW |