| 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/frame_buffer.h" | 5 #include "media/cast/framer/frame_buffer.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 { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 is_key_frame_ = rtp_header.is_key_frame; | 30 is_key_frame_ = rtp_header.is_key_frame; |
| 31 if (rtp_header.is_reference) { | 31 if (rtp_header.is_reference) { |
| 32 last_referenced_frame_id_ = rtp_header.reference_frame_id; | 32 last_referenced_frame_id_ = rtp_header.reference_frame_id; |
| 33 } else { | 33 } else { |
| 34 last_referenced_frame_id_ = rtp_header.frame_id - 1; | 34 last_referenced_frame_id_ = rtp_header.frame_id - 1; |
| 35 } | 35 } |
| 36 | 36 |
| 37 rtp_timestamp_ = rtp_header.webrtc.header.timestamp; | 37 rtp_timestamp_ = rtp_header.webrtc.header.timestamp; |
| 38 } | 38 } |
| 39 // Is this the correct frame? | 39 // Is this the correct frame? |
| 40 if (rtp_header.frame_id != frame_id_) return; | 40 if (rtp_header.frame_id != frame_id_) |
| 41 return; |
| 41 | 42 |
| 42 // Insert every packet only once. | 43 // Insert every packet only once. |
| 43 if (packets_.find(rtp_header.packet_id) != packets_.end()) { | 44 if (packets_.find(rtp_header.packet_id) != packets_.end()) { |
| 44 return; | 45 return; |
| 45 } | 46 } |
| 46 | 47 |
| 47 std::vector<uint8> data; | 48 std::vector<uint8> data; |
| 48 std::pair<PacketMap::iterator, bool> retval = | 49 std::pair<PacketMap::iterator, bool> retval = |
| 49 packets_.insert(make_pair(rtp_header.packet_id, data)); | 50 packets_.insert(make_pair(rtp_header.packet_id, data)); |
| 50 | 51 |
| 51 // Insert the packet. | 52 // Insert the packet. |
| 52 retval.first->second.resize(payload_size); | 53 retval.first->second.resize(payload_size); |
| 53 std::copy(payload_data, payload_data + payload_size, | 54 std::copy( |
| 54 retval.first->second.begin()); | 55 payload_data, payload_data + payload_size, retval.first->second.begin()); |
| 55 | 56 |
| 56 ++num_packets_received_; | 57 ++num_packets_received_; |
| 57 total_data_size_ += payload_size; | 58 total_data_size_ += payload_size; |
| 58 } | 59 } |
| 59 | 60 |
| 60 bool FrameBuffer::Complete() const { | 61 bool FrameBuffer::Complete() const { |
| 61 return num_packets_received_ - 1 == max_packet_id_; | 62 return num_packets_received_ - 1 == max_packet_id_; |
| 62 } | 63 } |
| 63 | 64 |
| 64 bool FrameBuffer::GetEncodedAudioFrame( | 65 bool FrameBuffer::GetEncodedAudioFrame( |
| 65 transport::EncodedAudioFrame* audio_frame, | 66 transport::EncodedAudioFrame* audio_frame, |
| 66 uint32* rtp_timestamp) const { | 67 uint32* rtp_timestamp) const { |
| 67 if (!Complete()) return false; | 68 if (!Complete()) |
| 69 return false; |
| 68 | 70 |
| 69 *rtp_timestamp = rtp_timestamp_; | 71 *rtp_timestamp = rtp_timestamp_; |
| 70 | 72 |
| 71 // Frame is complete -> construct. | 73 // Frame is complete -> construct. |
| 72 audio_frame->frame_id = frame_id_; | 74 audio_frame->frame_id = frame_id_; |
| 73 | 75 |
| 74 // Build the data vector. | 76 // Build the data vector. |
| 75 audio_frame->data.clear(); | 77 audio_frame->data.clear(); |
| 76 audio_frame->data.reserve(total_data_size_); | 78 audio_frame->data.reserve(total_data_size_); |
| 77 PacketMap::const_iterator it; | 79 PacketMap::const_iterator it; |
| 78 for (it = packets_.begin(); it != packets_.end(); ++it) { | 80 for (it = packets_.begin(); it != packets_.end(); ++it) { |
| 79 audio_frame->data.insert(audio_frame->data.end(), | 81 audio_frame->data.insert( |
| 80 it->second.begin(), it->second.end()); | 82 audio_frame->data.end(), it->second.begin(), it->second.end()); |
| 81 } | 83 } |
| 82 return true; | 84 return true; |
| 83 } | 85 } |
| 84 | 86 |
| 85 bool FrameBuffer::GetEncodedVideoFrame( | 87 bool FrameBuffer::GetEncodedVideoFrame( |
| 86 transport::EncodedVideoFrame* video_frame, | 88 transport::EncodedVideoFrame* video_frame, |
| 87 uint32* rtp_timestamp) const { | 89 uint32* rtp_timestamp) const { |
| 88 if (!Complete()) return false; | 90 if (!Complete()) |
| 91 return false; |
| 89 | 92 |
| 90 *rtp_timestamp = rtp_timestamp_; | 93 *rtp_timestamp = rtp_timestamp_; |
| 91 | 94 |
| 92 // Frame is complete -> construct. | 95 // Frame is complete -> construct. |
| 93 video_frame->key_frame = is_key_frame_; | 96 video_frame->key_frame = is_key_frame_; |
| 94 video_frame->frame_id = frame_id_; | 97 video_frame->frame_id = frame_id_; |
| 95 video_frame->last_referenced_frame_id = last_referenced_frame_id_; | 98 video_frame->last_referenced_frame_id = last_referenced_frame_id_; |
| 96 | 99 |
| 97 // Build the data vector. | 100 // Build the data vector. |
| 98 video_frame->data.clear(); | 101 video_frame->data.clear(); |
| 99 video_frame->data.reserve(total_data_size_); | 102 video_frame->data.reserve(total_data_size_); |
| 100 PacketMap::const_iterator it; | 103 PacketMap::const_iterator it; |
| 101 for (it = packets_.begin(); it != packets_.end(); ++it) { | 104 for (it = packets_.begin(); it != packets_.end(); ++it) { |
| 102 video_frame->data.insert(video_frame->data.end(), | 105 video_frame->data.insert( |
| 103 it->second.begin(), it->second.end()); | 106 video_frame->data.end(), it->second.begin(), it->second.end()); |
| 104 } | 107 } |
| 105 return true; | 108 return true; |
| 106 } | 109 } |
| 107 | 110 |
| 108 } // namespace cast | 111 } // namespace cast |
| 109 } // namespace media | 112 } // namespace media |
| OLD | NEW |