Remove VideoProcessor interface.

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

 /*
  *  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 87 matching lines @@
     case kExcludeOnlyFirstKeyFrame:
       return "ExcludeOnlyFirstKeyFrame";
     case kExcludeAllKeyFrames:
       return "ExcludeAllKeyFrames";
     default:
       RTC_NOTREACHED();
       return "Unknown";
   }
 }
 
-VideoProcessorImpl::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)
+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)
     : encoder_(encoder),
       decoder_(decoder),
       bitrate_allocator_(CreateBitrateAllocator(config)),
       encode_callback_(new VideoProcessorEncodeCompleteCallback(this)),
       decode_callback_(new VideoProcessorDecodeCompleteCallback(this)),
       packet_manipulator_(packet_manipulator),
       config_(config),
       analysis_frame_reader_(analysis_frame_reader),
       analysis_frame_writer_(analysis_frame_writer),
       source_frame_writer_(source_frame_writer),
       encoded_frame_writer_(encoded_frame_writer),
       decoded_frame_writer_(decoded_frame_writer),
       initialized_(false),
       last_encoded_frame_num_(-1),
       last_decoded_frame_num_(-1),
       first_key_frame_has_been_excluded_(false),
       last_decoded_frame_buffer_(0, analysis_frame_reader->FrameLength()),
       stats_(stats),
       num_dropped_frames_(0),
       num_spatial_resizes_(0) {
   RTC_DCHECK(encoder);
   RTC_DCHECK(decoder);
   RTC_DCHECK(packet_manipulator);
   RTC_DCHECK(analysis_frame_reader);
   RTC_DCHECK(analysis_frame_writer);
   RTC_DCHECK(stats);
   frame_infos_.reserve(analysis_frame_reader->NumberOfFrames());
 }
 
-VideoProcessorImpl::~VideoProcessorImpl() {
+VideoProcessor::~VideoProcessor() {
   encoder_->RegisterEncodeCompleteCallback(nullptr);
   decoder_->RegisterDecodeCompleteCallback(nullptr);
 }
 
-void VideoProcessorImpl::Init() {
+void VideoProcessor::Init() {
   RTC_DCHECK(!initialized_) << "VideoProcessor already initialized.";
   RTC_DCHECK(config_.codec_settings) << "No codec settings supplied.";
   initialized_ = true;
 
   // Setup required callbacks for the encoder and decoder.
   RTC_CHECK_EQ(encoder_->RegisterEncodeCompleteCallback(encode_callback_.get()),
                WEBRTC_VIDEO_CODEC_OK)
       << "Failed to register encode complete callback";
   RTC_CHECK_EQ(decoder_->RegisterDecodeCompleteCallback(decode_callback_.get()),
                WEBRTC_VIDEO_CODEC_OK)
@@ skipping 26 matching lines @@
       printf(" Codec implementation name  : %s_%s\n",
              CodecTypeToPayloadName(config_.codec_settings->codecType)
                  .value_or("Unknown"),
              encoder_->ImplementationName());
     }
     PrintCodecSettings(config_.codec_settings);
     printf("\n");
   }
 }
 
-bool VideoProcessorImpl::ProcessFrame(int frame_number) {
+bool VideoProcessor::ProcessFrame(int frame_number) {
   RTC_DCHECK_GE(frame_number, 0);
   RTC_DCHECK_LE(frame_number, frame_infos_.size())
       << "Must process frames without gaps.";
   RTC_DCHECK(initialized_) << "VideoProcessor not initialized.";
 
   rtc::scoped_refptr<I420BufferInterface> buffer(
       analysis_frame_reader_->ReadFrame());
 
   if (!buffer) {
     // Last frame has been reached.
@@ skipping 36 matching lines @@
 
   if (frame_stat->encode_return_code != WEBRTC_VIDEO_CODEC_OK) {
     LOG(LS_WARNING) << "Failed to encode frame " << frame_number
                     << ", return code: " << frame_stat->encode_return_code
                     << ".";
   }
 
   return true;
 }
 
-void VideoProcessorImpl::SetRates(int bit_rate, int frame_rate) {
+void VideoProcessor::SetRates(int bit_rate, int frame_rate) {
   config_.codec_settings->maxFramerate = frame_rate;
   int set_rates_result = encoder_->SetRateAllocation(
       bitrate_allocator_->GetAllocation(bit_rate * 1000, frame_rate),
       frame_rate);
   RTC_DCHECK_GE(set_rates_result, 0)
       << "Failed to update encoder with new rate " << bit_rate;
   num_dropped_frames_ = 0;
   num_spatial_resizes_ = 0;
 }
 
-size_t VideoProcessorImpl::EncodedFrameSize(int frame_number) {
+size_t VideoProcessor::EncodedFrameSize(int frame_number) {
   RTC_DCHECK_LT(frame_number, frame_infos_.size());
   return frame_infos_[frame_number].encoded_frame_size;
 }
 
-FrameType VideoProcessorImpl::EncodedFrameType(int frame_number) {
+FrameType VideoProcessor::EncodedFrameType(int frame_number) {
   RTC_DCHECK_LT(frame_number, frame_infos_.size());
   return frame_infos_[frame_number].encoded_frame_type;
 }
 
-int VideoProcessorImpl::GetQpFromEncoder(int frame_number) {
+int VideoProcessor::GetQpFromEncoder(int frame_number) {
   RTC_DCHECK_LT(frame_number, frame_infos_.size());
   return frame_infos_[frame_number].qp_encoder;
 }
 
-int VideoProcessorImpl::GetQpFromBitstream(int frame_number) {
+int VideoProcessor::GetQpFromBitstream(int frame_number) {
   RTC_DCHECK_LT(frame_number, frame_infos_.size());
   return frame_infos_[frame_number].qp_bitstream;
 }
 
-int VideoProcessorImpl::NumberDroppedFrames() {
+int VideoProcessor::NumberDroppedFrames() {
   return num_dropped_frames_;
 }
 
-int VideoProcessorImpl::NumberSpatialResizes() {
+int VideoProcessor::NumberSpatialResizes() {
   return num_spatial_resizes_;
 }
 
-void VideoProcessorImpl::FrameEncoded(
+void VideoProcessor::FrameEncoded(
     webrtc::VideoCodecType codec,
     const EncodedImage& encoded_image,
     const webrtc::RTPFragmentationHeader* fragmentation) {
   // For the highest measurement accuracy of the encode time, the start/stop
   // time recordings should wrap the Encode call as tightly as possible.
   int64_t encode_stop_ns = rtc::TimeNanos();
 
   if (encoded_frame_writer_) {
     RTC_CHECK(encoded_frame_writer_->WriteFrame(encoded_image, codec));
   }
@@ skipping 115 matching lines @@
         analysis_frame_writer_->WriteFrame(last_decoded_frame_buffer_.data()));
     if (decoded_frame_writer_) {
       RTC_DCHECK_EQ(last_decoded_frame_buffer_.size(),
                     decoded_frame_writer_->FrameLength());
       RTC_CHECK(
           decoded_frame_writer_->WriteFrame(last_decoded_frame_buffer_.data()));
     }
   }
 }
 
-void VideoProcessorImpl::FrameDecoded(const VideoFrame& image) {
+void VideoProcessor::FrameDecoded(const VideoFrame& image) {
   // For the highest measurement accuracy of the decode time, the start/stop
   // time recordings should wrap the Decode call as tightly as possible.
   int64_t decode_stop_ns = rtc::TimeNanos();
 
   // Update frame information and statistics.
   int frame_number = TimestampToFrameNumber(image.timestamp());
   RTC_DCHECK_LT(frame_number, frame_infos_.size());
   FrameInfo* frame_info = &frame_infos_[frame_number];
   frame_info->decoded_width = image.width();
   frame_info->decoded_height = image.height();
@@ skipping 47 matching lines @@
   RTC_DCHECK_EQ(extracted_length, analysis_frame_writer_->FrameLength());
   RTC_CHECK(analysis_frame_writer_->WriteFrame(extracted_buffer.data()));
   if (decoded_frame_writer_) {
     RTC_DCHECK_EQ(extracted_length, decoded_frame_writer_->FrameLength());
     RTC_CHECK(decoded_frame_writer_->WriteFrame(extracted_buffer.data()));
   }
 
   last_decoded_frame_buffer_ = std::move(extracted_buffer);
 }
 
-uint32_t VideoProcessorImpl::FrameNumberToTimestamp(int frame_number) {
+uint32_t VideoProcessor::FrameNumberToTimestamp(int frame_number) {
   RTC_DCHECK_GE(frame_number, 0);
   const int ticks_per_frame =
       kRtpClockRateHz / config_.codec_settings->maxFramerate;
   return (frame_number + 1) * ticks_per_frame;
 }
 
-int VideoProcessorImpl::TimestampToFrameNumber(uint32_t timestamp) {
+int VideoProcessor::TimestampToFrameNumber(uint32_t timestamp) {
   RTC_DCHECK_GT(timestamp, 0);
   const int ticks_per_frame =
       kRtpClockRateHz / config_.codec_settings->maxFramerate;
   RTC_DCHECK_EQ(timestamp % ticks_per_frame, 0);
   return (timestamp / ticks_per_frame) - 1;
 }
 
 }  // namespace test
 }  // namespace webrtc