| commit | 70c09bde41909e7bf221a070c17dfbd595bd360f | [log] [tgz] |
|---|---|---|
| author | Henrik Lundin <henrik.lundin@webrtc.org> | Mon Apr 24 15:56:56 2017 +0200 |
| committer | Henrik Lundin <henrik.lundin@webrtc.org> | Mon Apr 24 13:56:57 2017 +0000 |
| tree | 70b7c507f4ea3b0d4ad215b7e5610c9d1992ddbe | |
| parent | 7a7b3361d0c80c9583d95404986f67f107a0307c [diff] |
Reland of Change NetEq::InsertPacket to take an RTPHeader (patchset #1 id:1 of https://codereview.webrtc.org/2812933002/ ) Reason for revert: Downstream roadblock should be cleared by now. Relanding original patch. Original issue's description: > Revert of Change NetEq::InsertPacket to take an RTPHeader (patchset #2 id:20001 of https://codereview.webrtc.org/2807273004/ ) > > Reason for revert: > Broke downstream dependencies. > > Original issue's description: > > Change NetEq::InsertPacket to take an RTPHeader > > > > It used to take a WebRtcRTPHeader as input, which has an RTPHeader as > > a member. None of the other member in WebRtcRTPHeader where used in > > NetEq. > > > > This CL adapts the production code; tests and tools will be converted > > in a follow-up CL. > > > > BUG=webrtc:7467 > > > > Review-Url: https://codereview.webrtc.org/2807273004 > > Cr-Commit-Position: refs/heads/master@{#17652} > > Committed: https://chromium.googlesource.com/external/webrtc/+/4d027576a6f7420fc4ec6be7f4f991cfad34b826 > > TBR=ivoc@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7467 > > Review-Url: https://codereview.webrtc.org/2812933002 > Cr-Commit-Position: refs/heads/master@{#17657} > Committed: https://chromium.googlesource.com/external/webrtc/+/10d095d4f743bc16f8e486e156c48a6d023b32c5 R=ivoc@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_rel_ng BUG=webrtc:7467 Review-Url: https://codereview.webrtc.org/2835093002 . Cr-Commit-Position: refs/heads/master@{#17843}
diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/acm2/acm_receiver.cc index 2438bc8..f6f1786 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receiver.cc +++ b/webrtc/modules/audio_coding/acm2/acm_receiver.cc
@@ -104,8 +104,8 @@ } } // |crit_sect_| is released. - if (neteq_->InsertPacket(rtp_header, incoming_payload, receive_timestamp) < - 0) { + if (neteq_->InsertPacket(rtp_header.header, incoming_payload, + receive_timestamp) < 0) { LOG(LERROR) << "AcmReceiver::InsertPacket " << static_cast<int>(header->payloadType) << " Failed to insert packet";