1 files changed, 15 insertions, 4 deletions
diff --git a/chromium/third_party/webrtc/video/video_receive_stream.h b/chromium/third_party/webrtc/video/video_receive_stream.h
index 65fd887d339..2a3c6dfed38 100644
--- a/chromium/third_party/webrtc/video/video_receive_stream.h
+++ b/chromium/third_party/webrtc/video/video_receive_stream.h
@@ -16,7 +16,9 @@
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_render/include/video_render_defines.h"
 #include "webrtc/system_wrappers/interface/clock.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/video/encoded_frame_callback_adapter.h"
+#include "webrtc/video/receive_statistics_proxy.h"
 #include "webrtc/video/transport_adapter.h"
 #include "webrtc/video_engine/include/vie_render.h"
 #include "webrtc/video_receive_stream.h"
@@ -36,7 +38,9 @@ class VoiceEngine;
 namespace internal {
 
 class VideoReceiveStream : public webrtc::VideoReceiveStream,
+                           public I420FrameCallback,
                            public VideoRenderCallback {
+
  public:
   VideoReceiveStream(webrtc::VideoEngine* video_engine,
                      const VideoReceiveStream::Config& config,
@@ -45,11 +49,16 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
                      int base_channel);
   virtual ~VideoReceiveStream();
 
-  virtual void StartReceiving() OVERRIDE;
-  virtual void StopReceiving() OVERRIDE;
+  virtual void Start() OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual Stats GetStats() const OVERRIDE;
 
   virtual void GetCurrentReceiveCodec(VideoCodec* receive_codec) OVERRIDE;
 
+  // Overrides I420FrameCallback.
+  virtual void FrameCallback(I420VideoFrame* video_frame) OVERRIDE;
+
+  // Overrides VideoRenderCallback.
   virtual int32_t RenderFrame(const uint32_t stream_id,
                               I420VideoFrame& video_frame) OVERRIDE;
 
@@ -60,8 +69,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
  private:
   TransportAdapter transport_adapter_;
   EncodedFrameCallbackAdapter encoded_frame_proxy_;
-  VideoReceiveStream::Config config_;
-  Clock* clock_;
+  const VideoReceiveStream::Config config_;
+  Clock* const clock_;
 
   ViEBase* video_engine_base_;
   ViECodec* codec_;
@@ -71,6 +80,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
   ViERTP_RTCP* rtp_rtcp_;
   ViEImageProcess* image_process_;
 
+  scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
+
   int channel_;
 };
 }  // namespace internal