1497974 - Upstream changes to jitter_buffer.cc

Status: RESOLVED FIXED

(Core :: WebRTC: Audio/Video, enhancement, P3)

Description

[Dan Minor [:dminor]]

This bit:
 if (frame->Length() == 0) {
    // Normally only if MakeDecodable() on an incomplete frame threw it all away
    ReleaseFrame(frame);
    return NULL;
  }

Comment 1

[Dan Minor [:dminor]]

Attachment: Bug 1497974 - Remove local changes to jitter_buffer.cc; r=pehrsons

These modifications are made to code which we do not use and so
can be removed.

Comment 2

[Dan Minor [:dminor]]

This is in VCMJitterBuffer::ExtractAndSetDecode. The only place this is called outside of test code is in VCMReceiver::FrameForDecoding. The only place that is called outside of test code is in vcm::VideoReceiver::Decode which is only called outside of test code in VideoCodingModuleImpl::Decode, which is never called anywhere.

This is dead code and can be removed.

Comment 3

[Randell Jesup [:jesup] (needinfo me)]

So you're saying that all of VideoReceiver::Decode() is dead code?  (Is all of VideoReceiver?)  How did you check it isn't used anywhere?  (Not saying this is wrong, just want to make sure)

Comment 4

[Dan Minor [:dminor]]

The version of Decode at [1] is unused. The version at [2], with the comment "used for newer jitter buffer" is the one we use.

[1] https://searchfox.org/mozilla-central/rev/adec563403271e78d1a057259b3e17fe557dfd91/media/webrtc/trunk/webrtc/modules/video_coding/video_receiver.cc#227
[2] https://searchfox.org/mozilla-central/rev/adec563403271e78d1a057259b3e17fe557dfd91/media/webrtc/trunk/webrtc/modules/video_coding/video_receiver.cc#281

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2fb1dd0d8344
Remove local changes to jitter_buffer.cc; r=pehrsons

Comment 6

[Daniel Varga [:dvarga]]

https://hg.mozilla.org/mozilla-central/rev/2fb1dd0d8344