Step #4: Run VideoProcessor integration test batch mode on task queue.

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 96 matching lines @@
       output_filename(""),
       output_dir("out"),
       networking_config(),
       exclude_frame_types(kExcludeOnlyFirstKeyFrame),
       frame_length_in_bytes(0),
       use_single_core(false),
       keyframe_interval(0),
       codec_settings(nullptr),
       verbose(true) {}
 
-TestConfig::~TestConfig() {}
+TestConfig::~TestConfig() = default;
 
 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,
@@ skipping 21 matching lines @@
       num_spatial_resizes_(0),
       bit_rate_factor_(0.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(num_frames_);
+
+  task_checker_.Detach();
 }
 
+VideoProcessorImpl::~VideoProcessorImpl() = default;

[sprang_webrtc, 2017/03/20 19:36:17]

nit:  Could you declare ~VideoProcessor and ~VideoProcessorImpl in the same way?
Either inline in the header or here, but not one of both :)

[brandtr, 2017/03/21 09:40:54]

Done.

+
 bool VideoProcessorImpl::Init() {
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
   RTC_DCHECK(!initialized_)
       << "This VideoProcessor has already been initialized.";
 
   // Calculate a factor used for bit rate calculations.
   bit_rate_factor_ = config_.codec_settings->maxFramerate * 0.001 * 8;  // bits
 
   // Setup required callbacks for the encoder/decoder.
   RTC_CHECK_EQ(encoder_->RegisterEncodeCompleteCallback(encode_callback_.get()),
                WEBRTC_VIDEO_CODEC_OK)
       << "Failed to register encode complete callback";
@@ skipping 24 matching lines @@
     printf("    Decoder implementation name: %s\n",
            decoder_->ImplementationName());
     PrintCodecSettings(config_.codec_settings);
   }
 
   initialized_ = true;
 
   return true;
 }
 
-VideoProcessorImpl::~VideoProcessorImpl() {
+void VideoProcessorImpl::DeregisterCallbacks() {
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
   encoder_->RegisterEncodeCompleteCallback(nullptr);
   decoder_->RegisterDecodeCompleteCallback(nullptr);
 }
 
 void VideoProcessorImpl::SetRates(int bit_rate, int frame_rate) {
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
   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) {
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
   RTC_DCHECK_LT(frame_number, frame_infos_.size());
   return frame_infos_[frame_number].encoded_frame_size;
 }
 
 FrameType VideoProcessorImpl::EncodedFrameType(int frame_number) {
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
   RTC_DCHECK_LT(frame_number, frame_infos_.size());
   return frame_infos_[frame_number].encoded_frame_type;
 }
 
 int VideoProcessorImpl::NumberDroppedFrames() {
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
   return num_dropped_frames_;
 }
 
 int VideoProcessorImpl::NumberSpatialResizes() {
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
   return num_spatial_resizes_;
 }
 
 bool VideoProcessorImpl::ProcessFrame(int frame_number) {
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
   RTC_DCHECK_GE(frame_number, 0);
   RTC_DCHECK_LE(frame_number, frame_infos_.size())
       << "Must process frames without gaps.";
   RTC_DCHECK(initialized_) << "Attempting to use uninitialized VideoProcessor";
 
   rtc::scoped_refptr<VideoFrameBuffer> buffer(
       analysis_frame_reader_->ReadFrame());
 
   if (!buffer) {
     // Last frame has been reached.
@@ skipping 42 matching lines @@
 }
 
 void VideoProcessorImpl::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();
 
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
+
   if (encoded_frame_writer_) {
     RTC_CHECK(encoded_frame_writer_->WriteFrame(encoded_image, codec));
   }
 
   // Timestamp is proportional to frame number, so this gives us number of
   // dropped frames.
   int frame_number = TimestampToFrameNumber(encoded_image._timeStamp);
   bool last_frame_missing = false;
   if (frame_number > 0) {
     RTC_DCHECK_GE(last_encoded_frame_num_, 0);
@@ skipping 104 matching lines @@
           decoded_frame_writer_->WriteFrame(last_decoded_frame_buffer_.data()));
     }
   }
 }
 
 void VideoProcessorImpl::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();
 
+  RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_);
+
   // 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();
   FrameStatistic* frame_stat = &stats_->stats_[frame_number];
   frame_stat->decode_time_in_us =
       GetElapsedTimeMicroseconds(frame_info->decode_start_ns, decode_stop_ns);
   frame_stat->decoding_successful = true;
@@ skipping 55 matching lines @@
   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);
 }
 
 }  // namespace test
 }  // namespace webrtc