Remove VideoProcessor interface.

webrtc/modules/video_coding/codecs/test/videoprocessor.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 118 matching lines @@
 // would be altered, all the following delta frames would be pretty much
 // worthless. VP8 has an error-resilience feature that makes it able to handle
 // packet loss in key non-first keyframes, which is why only the first is
 // excluded by default.
 // Packet loss in such important frames is handled on a higher level in the
 // Video Engine, where signaling would request a retransmit of the lost packets,
 // since they're so important.
 //
 // Note this class is not thread safe in any way and is meant for simple testing
 // purposes.
-//
-// TODO(brandtr): Remove this interface.
 class VideoProcessor {
  public:
-  virtual ~VideoProcessor() {}
+  VideoProcessor(webrtc::VideoEncoder* encoder,
+                 webrtc::VideoDecoder* decoder,
+                 FrameReader* analysis_frame_reader,
+                 FrameWriter* analysis_frame_writer,
+                 PacketManipulator* packet_manipulator,
+                 const TestConfig& config,
+                 Stats* stats,
+                 FrameWriter* source_frame_writer,
+                 IvfFileWriter* encoded_frame_writer,
+                 FrameWriter* decoded_frame_writer);
+  ~VideoProcessor();
 
   // Sets up callbacks and initializes the encoder and decoder.
-  virtual void Init() = 0;
+  void Init();
 
   // Processes a single frame. Returns true as long as there's more frames
   // available in the source clip.
   // |frame_number| must be an integer >= 0.
-  virtual bool ProcessFrame(int frame_number) = 0;
+  bool ProcessFrame(int frame_number);
 
   // Updates the encoder with the target |bit_rate| and the |frame_rate|.
-  virtual void SetRates(int bit_rate, int frame_rate) = 0;
+  void SetRates(int bit_rate, int frame_rate);
 
   // Return the size of the encoded frame in bytes. Dropped frames by the
   // encoder are regarded as zero size.
-  virtual size_t EncodedFrameSize(int frame_number) = 0;
+  size_t EncodedFrameSize(int frame_number);
 
   // Return the encoded frame type (key or delta).
-  virtual FrameType EncodedFrameType(int frame_number) = 0;
+  FrameType EncodedFrameType(int frame_number);
 
   // Return the qp used by encoder.
-  virtual int GetQpFromEncoder(int frame_number) = 0;
+  int GetQpFromEncoder(int frame_number);
 
   // Return the qp from the qp parser.
-  virtual int GetQpFromBitstream(int frame_number) = 0;
+  int GetQpFromBitstream(int frame_number);
 
   // Return the number of dropped frames.
-  virtual int NumberDroppedFrames() = 0;
+  int NumberDroppedFrames();
 
   // Return the number of spatial resizes.
-  virtual int NumberSpatialResizes() = 0;
-};
-
-class VideoProcessorImpl : public VideoProcessor {
- public:
-  VideoProcessorImpl(webrtc::VideoEncoder* encoder,
-                     webrtc::VideoDecoder* decoder,
-                     FrameReader* analysis_frame_reader,
-                     FrameWriter* analysis_frame_writer,
-                     PacketManipulator* packet_manipulator,
-                     const TestConfig& config,
-                     Stats* stats,
-                     FrameWriter* source_frame_writer,
-                     IvfFileWriter* encoded_frame_writer,
-                     FrameWriter* decoded_frame_writer);
-  ~VideoProcessorImpl() override;
-
-  // Implements VideoProcessor.
-  void Init() override;
-  bool ProcessFrame(int frame_number) override;
-  void SetRates(int bit_rate, int frame_rate) override;
-  size_t EncodedFrameSize(int frame_number) override;
-  FrameType EncodedFrameType(int frame_number) override;
-  int GetQpFromEncoder(int frame_number) override;
-  int GetQpFromBitstream(int frame_number) override;
-  int NumberDroppedFrames() override;
-  int NumberSpatialResizes() override;
+  int NumberSpatialResizes();
 
  private:
   // Container that holds per-frame information that needs to be stored between
   // calls to Encode and Decode, as well as the corresponding callbacks. It is
   // not directly used for statistics -- for that, test::FrameStatistic is used.
   struct FrameInfo {
     FrameInfo()
         : timestamp(0),
           encode_start_ns(0),
           decode_start_ns(0),
@@ skipping 14 matching lines @@
     int decoded_height;
     size_t manipulated_length;
     int qp_encoder;
     int qp_bitstream;
   };
 
   // Callback class required to implement according to the VideoEncoder API.
   class VideoProcessorEncodeCompleteCallback
       : public webrtc::EncodedImageCallback {
    public:
-    explicit VideoProcessorEncodeCompleteCallback(VideoProcessorImpl* vp)
-        : video_processor_(vp) {}
+    explicit VideoProcessorEncodeCompleteCallback(
+        VideoProcessor* video_processor)
+        : video_processor_(video_processor) {}
     Result OnEncodedImage(
         const webrtc::EncodedImage& encoded_image,
         const webrtc::CodecSpecificInfo* codec_specific_info,
         const webrtc::RTPFragmentationHeader* fragmentation) override {
       // Forward to parent class.
       RTC_CHECK(codec_specific_info);
       video_processor_->FrameEncoded(codec_specific_info->codecType,
                                      encoded_image, fragmentation);
       return Result(Result::OK, 0);
     }
 
    private:
-    VideoProcessorImpl* const video_processor_;
+    VideoProcessor* const video_processor_;
   };
 
   // Callback class required to implement according to the VideoDecoder API.
   class VideoProcessorDecodeCompleteCallback
       : public webrtc::DecodedImageCallback {
    public:
-    explicit VideoProcessorDecodeCompleteCallback(VideoProcessorImpl* vp)
-        : video_processor_(vp) {}
+    explicit VideoProcessorDecodeCompleteCallback(
+        VideoProcessor* video_processor)
+        : video_processor_(video_processor) {}
     int32_t Decoded(webrtc::VideoFrame& image) override {
       // Forward to parent class.
       video_processor_->FrameDecoded(image);
       return 0;
     }
     int32_t Decoded(webrtc::VideoFrame& image,
                     int64_t decode_time_ms) override {
       return Decoded(image);
     }
     void Decoded(webrtc::VideoFrame& image,
                  rtc::Optional<int32_t> decode_time_ms,
                  rtc::Optional<uint8_t> qp) override {
       Decoded(image);
     }
 
    private:
-    VideoProcessorImpl* const video_processor_;
+    VideoProcessor* const video_processor_;
   };
 
   // Invoked by the callback when a frame has completed encoding.
   void FrameEncoded(webrtc::VideoCodecType codec,
                     const webrtc::EncodedImage& encodedImage,
                     const webrtc::RTPFragmentationHeader* fragmentation);
 
   // Invoked by the callback when a frame has completed decoding.
   void FrameDecoded(const webrtc::VideoFrame& image);
 
@@ skipping 48 matching lines @@
   // Statistics.
   Stats* stats_;
   int num_dropped_frames_;
   int num_spatial_resizes_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_