admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete FrameObject::size member.

Browse Source 
Replaced with a size() method, returning the corresponding attribute
(_length) of the underlying EncodedImage.

BUG=None

Review-Url: https://codereview.webrtc.org/2444193010
Cr-Commit-Position: refs/heads/master@{#14809}
This commit is contained in:
nisse 2016-10-28 00:37:29 -07:00 committed by Commit bot
parent 11f72b1945
commit 37abf53116
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/frame_buffer2.cc
View File

@ -119,7 +119,7 @@ FrameBuffer::ReturnReason FrameBuffer::NextFrame(
int64_t frame_delay;
if (inter_frame_delay_.CalculateDelay(timestamp, &frame_delay,
received_time)) {
jitter_estimator_->UpdateEstimate(frame_delay, frame->size);
jitter_estimator_->UpdateEstimate(frame_delay, frame->size());
}
float rtt_mult = protection_mode_ == kProtectionNackFEC ? 0.0 : 1.0;
timing_->SetJitterDelay(jitter_estimator_->GetJitterEstimate(rtt_mult));

1
webrtc/modules/video_coding/frame_object.cc
View File

@ -33,7 +33,6 @@ RtpFrameObject::RtpFrameObject(PacketBuffer* packet_buffer,
last_seq_num_(last_seq_num),
received_time_(received_time),
times_nacked_(times_nacked) {
size = frame_size;
VCMPacket* packet = packet_buffer_->GetPacket(first_seq_num);
if (packet) {
// TODO(philipel): Remove when encoded image is replaced by FrameObject.

3
webrtc/modules/video_coding/frame_object.h
View File

@ -36,6 +36,7 @@ class FrameObject : public webrtc::VCMEncodedFrame {
// When this frame should be rendered.
virtual int64_t RenderTime() const = 0;
size_t size() { return _length; }
// The tuple (|picture_id|, |spatial_layer|) uniquely identifies a frame
// object. For codec types that don't necessarily have picture ids they
@ -47,8 +48,6 @@ class FrameObject : public webrtc::VCMEncodedFrame {
size_t num_references;
uint16_t references[kMaxFrameReferences];
bool inter_layer_predicted;
size_t size;
};
class PacketBuffer;

2
webrtc/modules/video_coding/video_packet_buffer_unittest.cc
View File

@ -145,7 +145,7 @@ TEST_F(TestPacketBuffer, FrameSize) {
InsertPacket(seq_num + 3, kKeyFrame, kNotFirst, kLast, 5, data);
ASSERT_EQ(1UL, frames_from_callback_.size());
EXPECT_EQ(20UL, frames_from_callback_.begin()->second->size);
EXPECT_EQ(20UL, frames_from_callback_.begin()->second->size());
}
TEST_F(TestPacketBuffer, ExpandBuffer) {