Simplify VideoEncoder interface.

remoting/codec/video_encoder_verbatim.h

Index: remoting/codec/video_encoder_verbatim.h
diff --git a/remoting/codec/video_encoder_verbatim.h b/remoting/codec/video_encoder_verbatim.h
index f2078fce6711e6852dfd92c6999f1d504c878017..bd0e33eb1da65d1479f59098502107715e22cf2a 100644
--- a/remoting/codec/video_encoder_verbatim.h
+++ b/remoting/codec/video_encoder_verbatim.h
@@ -5,7 +5,6 @@
 #ifndef REMOTING_CODEC_VIDEO_ENCODER_VERBATIM_H_
 #define REMOTING_CODEC_VIDEO_ENCODER_VERBATIM_H_
 
-#include "base/time/time.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/proto/video.pb.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
@@ -19,40 +18,17 @@ class VideoEncoderVerbatim : public VideoEncoder {
   VideoEncoderVerbatim();
   virtual ~VideoEncoderVerbatim();
 
-  // Sets maximum size of data in video packets. Used by unittests.
-  void SetMaxPacketSize(int size);
-
   // VideoEncoder interface.
-  virtual void Encode(
-      const webrtc::DesktopFrame* frame,
-      const DataAvailableCallback& data_available_callback) OVERRIDE;
+  virtual scoped_ptr<VideoPacket> Encode(
+      const webrtc::DesktopFrame& frame) OVERRIDE;
 
  private:
-  // Encode a single dirty |rect|.
-  void EncodeRect(const webrtc::DesktopFrame* frame,
-                  const webrtc::DesktopRect& rect,
-                  bool last);
-
-  // Initializes first packet in a sequence of video packets to update screen
-  // rectangle |rect|.
-  void PrepareUpdateStart(const webrtc::DesktopFrame* frame,
-                          const webrtc::DesktopRect& rect,
-                          VideoPacket* packet);
-
   // Allocates a buffer of the specified |size| inside |packet| and returns the
   // pointer to it.
   uint8* GetOutputBuffer(VideoPacket* packet, size_t size);
 
-  // Submit |packet| to |callback_|.
-  void SubmitMessage(VideoPacket* packet, size_t rect_index);
-
-  DataAvailableCallback callback_;
-  base::Time encode_start_time_;
-
   // The most recent screen size.

[Wez, 2013/09/12 14:20:15]

nit: Suggest "Used to re-send screen-size only when it changes."

[Sergey Ulanov, 2013/09/12 19:18:45]

Done.

   webrtc::DesktopSize screen_size_;
-
-  int max_packet_size_;
 };
 
 }  // namespace remoting