[WebRTC] updated to upstream branch 49 and related.

this patch is based on 38d7a7883...226f2f0bd

dom/media/webrtc/MediaEngineRemoteVideoSource.h

@@ -19,6 +19,8 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsComponentManagerUtils.h"
 
+// Avoid warnings about redefinition of WARN_UNUSED_RESULT
+#include "ipc/IPCMessageUtils.h"
 #include "VideoUtils.h"
 #include "MediaEngineCameraVideoSource.h"
 #include "VideoSegment.h"
@@ -31,40 +33,29 @@
 
 // WebRTC library includes follow
 #include "webrtc/common.h"
-#include "webrtc/video_engine/include/vie_capture.h"
-#include "webrtc/video_engine/include/vie_render.h"
+
+// Camera Access via IPC
 #include "CamerasChild.h"
 
 #include "NullTransport.h"
 
-namespace webrtc {
-class I420VideoFrame;
-}
-
 namespace mozilla {
 
 /**
  * The WebRTC implementation of the MediaEngine interface.
  */
 class MediaEngineRemoteVideoSource : public MediaEngineCameraVideoSource,
-                                     public webrtc::ExternalRenderer
+                                     public camera::FrameRelay
 {
   typedef MediaEngineCameraVideoSource Super;
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
 
+  // Old ExternalRenderer
+  void FrameSizeChange(unsigned int w, unsigned int h) override;
   // ExternalRenderer
-  int FrameSizeChange(unsigned int w, unsigned int h,
-                      unsigned int streams) override;
-  int DeliverFrame(unsigned char* buffer,
-                   size_t size,
-                   uint32_t time_stamp,
-                   int64_t ntp_time,
-                   int64_t render_time,
-                   void *handle) override;
-  // XXX!!!! FIX THIS
-  int DeliverI420Frame(const webrtc::I420VideoFrame& webrtc_frame) override { return 0; };
-  bool IsTextureSupported() override { return false; };
+  int DeliverFrame(uint8_t* buffer,
+                   const camera::VideoFrameProperties& properties) override;
 
   // MediaEngineCameraVideoSource
   MediaEngineRemoteVideoSource(int aIndex, mozilla::camera::CaptureEngine aCapEngine,