commit 00733015fafbbc61ddc12dfdc88b21a9fcd9d122
author Taylor Brandstetter <deadbeef@webrtc.org> Thu Feb 15 20:07:11 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Feb 15 20:07:24 2018 +0000
tree 330004aaa487cabd6147146162a863b8495bef0a
parent 22bc3f60ce0e0bcb7b44185ae6fd3048f20d2883

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}

api/fec_controller.h

diff --git a/api/fec_controller.h b/api/fec_controller.h
index 59e86cc..aad2316 100644
--- a/api/fec_controller.h
+++ b/api/fec_controller.h
@@ -11,11 +11,10 @@
 #ifndef API_FEC_CONTROLLER_H_
 #define API_FEC_CONTROLLER_H_
 
-#include <memory>
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
-#include "modules/include/module_fec_types.h"
+#include "common_video/include/video_frame.h"
+#include "modules/include/module_common_types.h"
 
 namespace webrtc {
 // TODO(yinwa): work in progress. API in class FecController should not be
@@ -74,18 +73,11 @@
                                   int64_t round_trip_time_ms) = 0;
 
   // Informs of encoded output.
-  virtual void UpdateWithEncodedData(size_t encoded_image_length,
-                                     FrameType encoded_image_frametype) = 0;
+  virtual void UpdateWithEncodedData(const EncodedImage& encoded_image) = 0;
 
   // Returns whether this FEC Controller needs Loss Vector Mask as input.
   virtual bool UseLossVectorMask() = 0;
 };
 
-class FecControllerFactoryInterface {
- public:
-  virtual std::unique_ptr<FecController> CreateFecController() = 0;
-  virtual ~FecControllerFactoryInterface() = default;
-};
-
 }  // namespace webrtc
 #endif  // API_FEC_CONTROLLER_H_