Add unit tests for qp parser.

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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/api/video/video_frame.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h"
 #include "webrtc/modules/video_coding/codecs/test/stats.h"
 #include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
+#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
+#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
 #include "webrtc/test/testsupport/frame_reader.h"
 #include "webrtc/test/testsupport/frame_writer.h"
 
 namespace webrtc {
 
 class VideoBitrateAllocator;
 
 namespace test {
 
 // Defines which frame types shall be excluded from packet loss and when.
@@ skipping 100 matching lines @@
 
   // Performs initial calculations about frame size, sets up callbacks etc.
   // Returns false if an error has occurred, in addition to printing to stderr.
   virtual bool 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.
   virtual bool ProcessFrame(int frame_number) = 0;
 
+  // Return the qp used by encoder.
+  virtual int GetQpFromEncoder() = 0;

[brandtr, 2017/05/26 07:18:45]

See comment below first.

Add parameter "int frame_number", to be used to pick out the right object from
|frame_infos_|.

Move to between "EncodedFrameType" and "NumberDroppedFrames" below.

[jianj, 2017/05/26 18:20:27]

Done.

+
+  // Return the qp from the qp parser.
+  virtual int GetQpFromBitstream() = 0;

[brandtr, 2017/05/26 07:18:45]

Same here.

[jianj, 2017/05/26 18:20:27]

Done.

+
   // Updates the encoder with the target bit rate and the frame rate.
   virtual void SetRates(int bit_rate, int frame_rate) = 0;
 
   // 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;
 
   // Return the encoded frame type (key or delta).
   virtual FrameType EncodedFrameType(int frame_number) = 0;
 
@@ skipping 13 matching lines @@
                      PacketManipulator* packet_manipulator,
                      const TestConfig& config,
                      Stats* stats,
                      FrameWriter* source_frame_writer,
                      IvfFileWriter* encoded_frame_writer,
                      FrameWriter* decoded_frame_writer);
   virtual ~VideoProcessorImpl();
   bool Init() override;
   bool ProcessFrame(int frame_number) override;
 
+  int GetQpFromEncoder() override;

[brandtr, 2017/05/26 07:18:45]

Place these two lines in the private section (*), between "EncodedFrameType" and
"NumberDroppedFrames".

(*) This is OK since they are overriding public functions in VideoProcessor.

[jianj, 2017/05/26 18:20:27]

Done.

+  int GetQpFromBitstream() 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),
           encoded_frame_size(0),
@@ skipping 60 matching lines @@
   };
 
   // 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);
 
+

[brandtr, 2017/05/26 07:18:45]

Remove.

[jianj, 2017/05/26 18:20:27]

Done.

   // 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 number of dropped frames.
@@ skipping 45 matching lines @@
   bool first_key_frame_has_been_excluded_;
 
   // Keep track of the last successfully decoded frame, since we write that
   // frame to disk when decoding fails.
   rtc::Buffer last_decoded_frame_buffer_;
 
   // Statistics.
   Stats* stats_;
   int num_dropped_frames_;
   int num_spatial_resizes_;
+
+  int qp_encoder_;

[brandtr, 2017/05/26 07:18:45]

We are trying to get away from using direct member variables to carry state
about the encoded frames in this class.

Could you move these two variables to be part of the FrameInfo struct instead?

[jianj, 2017/05/26 18:20:27]

Done.

+  int qp_bitstream_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_