Define Stream base classes

talk/media/webrtc/fakewebrtccall.h

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 24 matching lines @@
 #include "webrtc/video_frame.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_send_stream.h"
 
 namespace cricket {
 class FakeAudioReceiveStream : public webrtc::AudioReceiveStream {
  public:
   explicit FakeAudioReceiveStream(
       const webrtc::AudioReceiveStream::Config& config);
 
+  // webrtc::AudioReceiveStream implementation.

[pbos-webrtc, 2015/07/14 14:50:14]

Imo. you don't need this comment and the ones below.

[Jelena, 2015/07/15 11:12:03]

I actually like to have method overrides grouped and marked like this. Imo, it
makes the header easier to navigate.
Also, I have seen this practice a lot in our code base. So, if you don't mind
terribly, I would like to keep the comments, ok?

   webrtc::AudioReceiveStream::Stats GetStats() const override;
 
   const webrtc::AudioReceiveStream::Config& GetConfig() const;
 
   int received_packets() const { return received_packets_; }
   void IncrementReceivedPackets();
 
  private:
+  // webrtc::ReceiveStream implementation.
+  void Start() override {}
+  void Stop() override {}
+  void SignalNetworkState(webrtc::NetworkState state) override {}
+  bool DeliverRtcp(const uint8_t* packet, size_t length) override {
+    return true;
+  }
+  bool DeliverRtp(const uint8_t* packet, size_t length) override {
+    return true;
+  }
+
   webrtc::AudioReceiveStream::Config config_;
   int received_packets_;
 };
 
 class FakeVideoSendStream : public webrtc::VideoSendStream,
                             public webrtc::VideoCaptureInput {
  public:
   FakeVideoSendStream(const webrtc::VideoSendStream::Config& config,
                       const webrtc::VideoEncoderConfig& encoder_config);
   webrtc::VideoSendStream::Config GetConfig() const;
   webrtc::VideoEncoderConfig GetEncoderConfig() const;
   std::vector<webrtc::VideoStream> GetVideoStreams();
 
   bool IsSending() const;
   bool GetVp8Settings(webrtc::VideoCodecVP8* settings) const;
   bool GetVp9Settings(webrtc::VideoCodecVP9* settings) const;
 
   int GetNumberOfSwappedFrames() const;
   int GetLastWidth() const;
   int GetLastHeight() const;
   void SetStats(const webrtc::VideoSendStream::Stats& stats);
 
  private:
   void IncomingCapturedFrame(const webrtc::VideoFrame& frame) override;
+
+  // webrtc::SendStream implementation.
+  void Start() override;
+  void Stop() override;
+  void SignalNetworkState(webrtc::NetworkState state) override {}
+  bool DeliverRtcp(const uint8_t* packet, size_t length) override {
+    return true;
+  }
+
+  // webrtc::VideoSendStream implementation.
   webrtc::VideoSendStream::Stats GetStats() override;
-
   bool ReconfigureVideoEncoder(
       const webrtc::VideoEncoderConfig& config) override;
-
   webrtc::VideoCaptureInput* Input() override;
 
-  void Start() override;
-  void Stop() override;
-
   bool sending_;
   webrtc::VideoSendStream::Config config_;
   webrtc::VideoEncoderConfig encoder_config_;
   bool codec_settings_set_;
   union VpxSettings {
     webrtc::VideoCodecVP8 vp8;
     webrtc::VideoCodecVP9 vp9;
   } vpx_settings_;
   int num_swapped_frames_;
   webrtc::VideoFrame last_frame_;
   webrtc::VideoSendStream::Stats stats_;
 };
 
 class FakeVideoReceiveStream : public webrtc::VideoReceiveStream {
  public:
   explicit FakeVideoReceiveStream(
       const webrtc::VideoReceiveStream::Config& config);
 
   webrtc::VideoReceiveStream::Config GetConfig();
 
   bool IsReceiving() const;
 
   void InjectFrame(const webrtc::VideoFrame& frame, int time_to_render_ms);
 
   void SetStats(const webrtc::VideoReceiveStream::Stats& stats);
 
  private:
-  webrtc::VideoReceiveStream::Stats GetStats() const override;
-
+  // webrtc::ReceiveStream implementation.
   void Start() override;
   void Stop() override;
+  void SignalNetworkState(webrtc::NetworkState state) override {}
+  bool DeliverRtcp(const uint8_t* packet, size_t length) override {
+    return true;
+  }
+  bool DeliverRtp(const uint8_t* packet, size_t length) override {
+    return true;
+  }
+
+  // webrtc::VideoReceiveStream implementation.
+  webrtc::VideoReceiveStream::Stats GetStats() const override;
 
   webrtc::VideoReceiveStream::Config config_;
   bool receiving_;
   webrtc::VideoReceiveStream::Stats stats_;
 };
 
 class FakeCall : public webrtc::Call, public webrtc::PacketReceiver {
  public:
   explicit FakeCall(const webrtc::Call::Config& config);
-  ~FakeCall();
+  ~FakeCall() override;
 
   webrtc::Call::Config GetConfig() const;
   const std::vector<FakeVideoSendStream*>& GetVideoSendStreams();
   const std::vector<FakeVideoReceiveStream*>& GetVideoReceiveStreams();
 
   const std::vector<FakeAudioReceiveStream*>& GetAudioReceiveStreams();
   const FakeAudioReceiveStream* GetAudioReceiveStream(uint32_t ssrc);
 
-  webrtc::Call::NetworkState GetNetworkState() const;
+  webrtc::NetworkState GetNetworkState() const;
   int GetNumCreatedSendStreams() const;
   int GetNumCreatedReceiveStreams() const;
   void SetStats(const webrtc::Call::Stats& stats);
 
  private:
   webrtc::AudioSendStream* CreateAudioSendStream(
       const webrtc::AudioSendStream::Config& config) override;
   void DestroyAudioSendStream(webrtc::AudioSendStream* send_stream) override;
 
   webrtc::AudioReceiveStream* CreateAudioReceiveStream(
@@ skipping 12 matching lines @@
       webrtc::VideoReceiveStream* receive_stream) override;
   webrtc::PacketReceiver* Receiver() override;
 
   DeliveryStatus DeliverPacket(webrtc::MediaType media_type,
                                const uint8_t* packet, size_t length) override;
 
   webrtc::Call::Stats GetStats() const override;
 
   void SetBitrateConfig(
       const webrtc::Call::Config::BitrateConfig& bitrate_config) override;
-  void SignalNetworkState(webrtc::Call::NetworkState state) override;
+  void SignalNetworkState(webrtc::NetworkState state) override;
 
   webrtc::Call::Config config_;
-  webrtc::Call::NetworkState network_state_;
+  webrtc::NetworkState network_state_;
   webrtc::Call::Stats stats_;
   std::vector<FakeVideoSendStream*> video_send_streams_;
   std::vector<FakeVideoReceiveStream*> video_receive_streams_;
   std::vector<FakeAudioReceiveStream*> audio_receive_streams_;
 
   int num_created_send_streams_;
   int num_created_receive_streams_;
 };
 
 }  // namespace cricket
 #endif  // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_UNITTEST_H_