Step #0: Minor cleanups in VideoProcessor.

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 233 matching lines @@
   FrameType EncodedFrameType() override;
 
   // Return the number of dropped frames.
   int NumberDroppedFrames() override;
 
   // Return the number of spatial resizes.
   int NumberSpatialResizes() override;
 
   webrtc::VideoEncoder* const encoder_;
   webrtc::VideoDecoder* const decoder_;
-  std::unique_ptr<VideoBitrateAllocator> bitrate_allocator_;
+  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_;
+  const TestConfig& config_;
+
   // These (mandatory) file manipulators are used for, e.g., objective PSNR and
   // SSIM calculations at the end of a test run.
   FrameReader* const analysis_frame_reader_;
   FrameWriter* const analysis_frame_writer_;
-  PacketManipulator* const packet_manipulator_;
-  const TestConfig& config_;
-  Stats* stats_;
+
   // These (optional) file writers are used for persistently storing the output
   // of the coding pipeline at different stages: pre encode (source), post
   // encode (encoded), and post decode (decoded). The purpose is to give the
   // experimenter an option to subjectively evaluate the quality of the
   // encoding, given the test settings. Each frame writer is enabled by being
   // non-null.
   FrameWriter* const source_frame_writer_;
   IvfFileWriter* const encoded_frame_writer_;
   FrameWriter* const decoded_frame_writer_;
 
-  // Adapters for the codec callbacks.
-  std::unique_ptr<EncodedImageCallback> encode_callback_;
-  std::unique_ptr<DecodedImageCallback> decode_callback_;
-
   // Keep track of the last successful frame, since we need to write that
   // when decoding fails.
   std::unique_ptr<uint8_t[]> last_successful_frame_buffer_;
   // To keep track of if we have excluded the first key frame from packet loss.
   bool first_key_frame_has_been_excluded_;
   // To tell the decoder previous frame have been dropped due to packet loss.
   bool last_frame_missing_;
   // If Init() has executed successfully.
   bool initialized_;
   size_t encoded_frame_size_;
   FrameType encoded_frame_type_;
   int prev_time_stamp_;
-  int num_dropped_frames_;
-  int num_spatial_resizes_;
   int last_encoder_frame_width_;
   int last_encoder_frame_height_;
 
   // Statistics.
+  Stats* stats_;
+  int num_dropped_frames_;
+  int num_spatial_resizes_;
   double bit_rate_factor_;  // Multiply frame length with this to get bit rate.
   int64_t encode_start_ns_;
   int64_t decode_start_ns_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_