Work on flexible mode and screen sharing.

webrtc/modules/video_coding/codecs/vp9/vp9_impl.h

 /*
  *  Copyright (c) 2014 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_VP9_IMPL_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_IMPL_H_
 
 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
+#include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h"
 #include "webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h"
 
 #include "vpx/svc_context.h"
 #include "vpx/vpx_decoder.h"
 #include "vpx/vpx_encoder.h"
 
 namespace webrtc {
 
 class VP9EncoderImpl : public VP9Encoder {
  public:
@@ skipping 25 matching lines @@
 
   // Call encoder initialize function and set control settings.
   int InitAndSetControlSettings(const VideoCodec* inst);
 
   void PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
                              const vpx_codec_cx_pkt& pkt,
                              uint32_t timestamp);
 
   bool SetSvcRates();
 
+  /*
+   * Generate the flags used when calling vpx_encoder_encode and also
+   * saves information used to reference this frame to earlier frames.
+   * Used in flexible mode and has to be called for every frame (even
+   * keyframes) in order to update its state. The information used
+   * for references is saved in p_diff_ and num_ref_pics_.
+   *
+   * upd_buffer - which buffer to update:
+   *       -2: this is a keyframe, always stored in buffer
+   *           0 and all other params are ignored
+   *       -1: don't update any buffers
+   *     0..2: update buffer 0..2
+   *
+   * ref_buf1, ref_buf2, ref_buf3 - which buffers to reference back to:
+   *       -1: don't reference any buffer
+   *     0..2: reference buffer 0..2
+   *
+   */
+  vpx_enc_frame_flags_t GenerateRefsAndFlags(int8_t upd_buffer = -2,
+                                             int8_t ref_buf1 = -1,
+                                             int8_t ref_buf2 = -1,
+                                             int8_t ref_buf3 = -1);
+  vpx_enc_frame_flags_t GenerateRefsAndFlags(std::array<int8_t, 4> args);
+
   virtual int GetEncodedLayerFrame(const vpx_codec_cx_pkt* pkt);
 
   // Callback function for outputting packets per spatial layer.
   static void EncoderOutputCodedPacketCallback(vpx_codec_cx_pkt* pkt,
                                                void* user_data);
 
   // Determine maximum target for Intra frames
   //
   // Input:
   //    - optimal_buffer_size : Optimal buffer size
@@ skipping 10 matching lines @@
   int cpu_speed_;
   uint32_t rc_max_intra_target_;
   vpx_codec_ctx_t* encoder_;
   vpx_codec_enc_cfg_t* config_;
   vpx_image_t* raw_;
   SvcInternal_t svc_internal_;
   const VideoFrame* input_image_;
   GofInfoVP9 gof_;       // Contains each frame's temporal information for
                          // non-flexible mode.
   uint8_t tl0_pic_idx_;  // Only used in non-flexible mode.
-  size_t gof_idx_;       // Only used in non-flexible mode.
+  size_t frames_since_kf_;
   uint8_t num_temporal_layers_;
   uint8_t num_spatial_layers_;
+
+  // Used for flexible mode
+  bool is_flexible_mode_;
+  int64_t buf_upd_at_frame_[8];
+  int64_t frames_encoded_;
+  uint8_t num_refs_pics_;
+  uint8_t p_diff_[kMaxVp9RefPics];
+  ScreenshareLayersVP9 temporal_layer_;
 };
 
 
 class VP9DecoderImpl : public VP9Decoder {
  public:
   VP9DecoderImpl();
 
   virtual ~VP9DecoderImpl();
 
   int InitDecode(const VideoCodec* inst, int number_of_cores) override;
@@ skipping 17 matching lines @@
   Vp9FrameBufferPool frame_buffer_pool_;
   DecodedImageCallback* decode_complete_callback_;
   bool inited_;
   vpx_codec_ctx_t* decoder_;
   VideoCodec codec_;
   bool key_frame_required_;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_IMPL_H_