zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bugs introduced by https://code.google.com/p/webrtc/source/detail?r=6667 .

Browse Source 
A few places were relying on temporalIdx being signed. Fix to explicitly check
for kNoTemporalIdx.

TBR=pbos,stefan

Review URL: https://webrtc-codereview.appspot.com/13939005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6669 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org
2014-07-11 20:33:39 +00:00
parent dd6780d85d
commit 9e1acc8728
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/video_coding/main/source/video_sender_unittest.cc
View File

@ -141,10 +141,10 @@ class PacketizationCallback : public VCMPacketizationCallback {
int frames = 0;
for (size_t i = 0; i < frame_data_.size(); ++i) {
EXPECT_EQ(kRtpVideoVp8, frame_data_[i].rtp_video_header.codec);
if (frame_data_[i].rtp_video_header.codecHeader.VP8.temporalIdx <=
temporal_layer) {
const uint8_t temporal_idx =
frame_data_[i].rtp_video_header.codecHeader.VP8.temporalIdx;
if (temporal_idx <= temporal_layer || temporal_idx == kNoTemporalIdx)
frames++;
}
}
return frames;
}
@ -153,10 +153,10 @@ class PacketizationCallback : public VCMPacketizationCallback {
int payload_size = 0;
for (size_t i = 0; i < frame_data_.size(); ++i) {
EXPECT_EQ(kRtpVideoVp8, frame_data_[i].rtp_video_header.codec);
if (frame_data_[i].rtp_video_header.codecHeader.VP8.temporalIdx <=
temporal_layer) {
const uint8_t temporal_idx =
frame_data_[i].rtp_video_header.codecHeader.VP8.temporalIdx;
if (temporal_idx <= temporal_layer || temporal_idx == kNoTemporalIdx)
payload_size += frame_data_[i].payload_size;
}
}
return payload_size;
}