Extract common simulcast logic from VP8 wrapper and simulcast adapter

webrtc/modules/video_coding/codecs/vp8/vp8_impl.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.
  *
  * WEBRTC VP8 wrapper interface
@@ skipping 10 matching lines @@
 #include "vpx/vpx_decoder.h"
 #include "vpx/vp8cx.h"
 #include "vpx/vp8dx.h"
 
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #include "webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h"
 #include "webrtc/modules/video_coding/utility/frame_dropper.h"
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
+#include "webrtc/modules/video_coding/utility/simulcast_state.h"
+
 #include "webrtc/video_frame.h"
 
 namespace webrtc {
 
 class TemporalLayers;
 
 class VP8EncoderImpl : public VP8Encoder {
  public:
   VP8EncoderImpl();
 
@@ skipping 38 matching lines @@
 
   void PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
                              const vpx_codec_cx_pkt& pkt,
                              int stream_idx,
                              uint32_t timestamp,
                              bool only_predicting_from_key_frame);
 
   int GetEncodedPartitions(const VideoFrame& input_image,
                            bool only_predicting_from_key_frame);
 
-  // Set the stream state for stream |stream_idx|.
-  void SetStreamState(bool send_stream, int stream_idx);
-
   uint32_t MaxIntraTarget(uint32_t optimal_buffer_size);
 
   EncodedImageCallback* encoded_complete_callback_;
   VideoCodec codec_;
   bool inited_;
   int64_t timestamp_;
   bool feedback_mode_;
   int qp_max_;
   int cpu_speed_default_;
   uint32_t rc_max_intra_target_;
   int token_partitions_;
   ReferencePictureSelection rps_;
   std::vector<TemporalLayers*> temporal_layers_;
+  SimulcastState simulcast_state_;
   bool down_scale_requested_;
   uint32_t down_scale_bitrate_;
-  FrameDropper tl0_frame_dropper_;
-  FrameDropper tl1_frame_dropper_;
   std::vector<uint16_t> picture_id_;
   std::vector<int> last_key_frame_picture_id_;
-  std::vector<bool> key_frame_request_;
-  std::vector<bool> send_stream_;
   std::vector<int> cpu_speed_;
   std::vector<vpx_image_t> raw_images_;
   std::vector<EncodedImage> encoded_images_;
   std::vector<vpx_codec_ctx_t> encoders_;
   std::vector<vpx_codec_enc_cfg_t> configurations_;
   std::vector<vpx_rational_t> downsampling_factors_;
   QualityScaler quality_scaler_;
   bool quality_scaler_enabled_;
 };  // end of VP8EncoderImpl class
 
@@ skipping 39 matching lines @@
   int image_format_;
   vpx_ref_frame_t* ref_frame_;
   int propagation_cnt_;
   int last_frame_width_;
   int last_frame_height_;
   bool key_frame_required_;
 };  // end of VP8DecoderImpl class
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_