Revert "Enables PeerConnectionFactory using external fec controller"
This reverts commit 4f07bdb25567d8ef528311e0b50a62c61d543fc3. Reason for revert: Speculatively reverting, because downstream test is now hitting "PeerConnectionFactory.initialize was not called before creating a PeerConnectionFactory" error, even though it did call initialize. I don't see how any change in this CL could cause that, but it's the only CL on the blamelist, and it does modify PeerConnectionFactory.java Original change's description: > Enables PeerConnectionFactory using external fec controller > > Bug: webrtc:8799 > Change-Id: Ieb2cf6163b9a83844ab9ed4822b4a7f1db4c24b8 > Reviewed-on: https://webrtc-review.googlesource.com/43961 > Commit-Queue: Ying Wang <yinwa@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22038} TBR=sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org Change-Id: I95868c35d6f9973e0ebf563814cd71d0fcbd433d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8799 Reviewed-on: https://webrtc-review.googlesource.com/54080 Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22040}
This commit is contained in:
committed by
Commit Bot
parent
22bc3f60ce
commit
00733015fa
@ -412,8 +412,7 @@ EncodedImageCallback::Result VCMEncodedFrameCallback::OnEncodedImage(
|
||||
return result;
|
||||
|
||||
if (media_opt_) {
|
||||
media_opt_->UpdateWithEncodedData(image_copy._length,
|
||||
image_copy._frameType);
|
||||
media_opt_->UpdateWithEncodedData(image_copy);
|
||||
if (internal_source_) {
|
||||
// Signal to encoder to drop next frame.
|
||||
result.drop_next_frame = media_opt_->DropFrame();
|
||||
|
||||
Reference in New Issue
Block a user