generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation error

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/358005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1508 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org
2012-01-23 16:46:38 +00:00
parent b30f0edce6
commit 376be6c904
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/rtp_rtcp/source/Android.mk
View File

@@ -27,6 +27,7 @@ LOCAL_SRC_FILES := \
rtp_receiver.cc \ rtp_receiver.cc \
rtp_sender.cc \ rtp_sender.cc \
rtp_utility.cc \ rtp_utility.cc \
rtp_header_extension.cc \
ssrc_database.cc \ ssrc_database.cc \
tmmbr_help.cc \ tmmbr_help.cc \
dtmf_queue.cc \ dtmf_queue.cc \
@@ -37,10 +38,13 @@ LOCAL_SRC_FILES := \
forward_error_correction_internal.cc \ forward_error_correction_internal.cc \
overuse_detector.cc \ overuse_detector.cc \
remote_rate_control.cc \ remote_rate_control.cc \
rtp_packet_history.cc \
receiver_fec.cc \ receiver_fec.cc \
rtp_receiver_video.cc \ rtp_receiver_video.cc \
rtp_sender_video.cc \ rtp_sender_video.cc \
rtp_format_vp8.cc rtp_format_vp8.cc \
transmission_bucket.cc \
vp8_partition_aggregator.cc
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \

4
src/modules/rtp_rtcp/source/rtp_packet_history.cc
View File

@@ -138,7 +138,7 @@ int32_t RTPPacketHistory::PutRTPPacket(const uint8_t* packet,
// Store packet // Store packet
std::vector<std::vector<uint8_t> >::iterator it = std::vector<std::vector<uint8_t> >::iterator it =
stored_packets_.begin() + prev_index_; stored_packets_.begin() + prev_index_;
copy(packet, packet + packet_length, it->begin()); std::copy(packet, packet + packet_length, it->begin());
stored_seq_nums_[prev_index_] = seq_num; stored_seq_nums_[prev_index_] = seq_num;
stored_lengths_[prev_index_] = packet_length; stored_lengths_[prev_index_] = packet_length;
@@ -218,7 +218,7 @@ bool RTPPacketHistory::GetRTPPacket(uint16_t sequence_number,
// Get packet. // Get packet.
std::vector<std::vector<uint8_t> >::const_iterator it_found_packet = std::vector<std::vector<uint8_t> >::const_iterator it_found_packet =
stored_packets_.begin() + index; stored_packets_.begin() + index;
copy(it_found_packet->begin(), it_found_packet->begin() + length, packet); std::copy(it_found_packet->begin(), it_found_packet->begin() + length, packet);
*packet_length = stored_lengths_.at(index); *packet_length = stored_lengths_.at(index);
*stored_time_ms = stored_times_.at(index); *stored_time_ms = stored_times_.at(index);
*type = stored_types_.at(index); *type = stored_types_.at(index);