Minor improvements to VideoProcessor and corresponding test.

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() {}
 
   // Sets up callbacks and initializes the encoder and decoder.
   virtual void Init() = 0;
 
   // 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.
@@ skipping 27 matching lines @@
   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);
-  virtual ~VideoProcessorImpl();
+  ~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;
 
  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 49 matching lines @@
       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,
-              decode_time_ms ? static_cast<int32_t>(*decode_time_ms) : -1);
+      Decoded(image);
     }
 
    private:
     VideoProcessorImpl* 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);
 
-  // Updates the encoder with the target bit rate and the frame rate.
-  void SetRates(int bit_rate, int frame_rate) override;
-
-  // Return the size of the encoded frame in bytes.
-  size_t EncodedFrameSize(int frame_number) override;
-
-  // Return the encoded frame type (key or delta).
-  FrameType EncodedFrameType(int frame_number) override;
-
-  // Return the qp used by encoder.
-  int GetQpFromEncoder(int frame_number) override;
-
-  // Return the qp from the qp parser.
-  int GetQpFromBitstream(int frame_number) override;
-
-  // Return the number of dropped frames.
-  int NumberDroppedFrames() override;
-
-  // Return the number of spatial resizes.
-  int NumberSpatialResizes() override;
+  // Use the frame number as the basis for timestamp to identify frames. Let the
+  // first timestamp be non-zero, to not make the IvfFileWriter believe that we
+  // want to use capture timestamps in the IVF files.
+  uint32_t FrameNumberToTimestamp(int frame_number);
+  int TimestampToFrameNumber(uint32_t timestamp);
 
   webrtc::VideoEncoder* const encoder_;
   webrtc::VideoDecoder* const decoder_;
   const std::unique_ptr<VideoBitrateAllocator> bitrate_allocator_;
 
   // Adapters for the codec callbacks.
   const std::unique_ptr<EncodedImageCallback> encode_callback_;
   const std::unique_ptr<DecodedImageCallback> decode_callback_;
 
   PacketManipulator* const packet_manipulator_;
@@ skipping 33 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_