Integration of VP9 packetization.

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/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:
   VP9EncoderImpl();
 
   virtual ~VP9EncoderImpl();
@@ skipping 20 matching lines @@
   // Determine number of encoder threads to use.
   int NumberOfThreads(int width, int height, int number_of_cores);
 
   // 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);
 
-  int GetEncodedPartitions(const VideoFrame& input_image);
+  int SetSvcRates();
+  virtual int GetEncodedLayerFrame(const vpx_codec_cx_pkt* pkt);
+  // Callback function for outputting packets per spatial layer.

[stefan-webrtc, 2015/07/09 14:48:59]

Newline above.

[åsapersson, 2015/07/29 12:10:12]

Done.

+  static void EncocderOutputCodedPacketCb(vpx_codec_cx_pkt* pkt,

[stefan-webrtc, 2015/07/09 14:48:59]

Cb -> Callback.

Maybe move this to the .cc file? I also don't think it needs to be a static
method of the class, just make it a function.

[åsapersson, 2015/07/29 12:10:12]

Renamed and moved to cc-file.

+                                          void* user_data) {
+    VP9EncoderImpl* enc = (VP9EncoderImpl*)(user_data);
+    enc->GetEncodedLayerFrame(pkt);
+  }
 
   // Determine maximum target for Intra frames
   //
   // Input:
   //    - optimal_buffer_size : Optimal buffer size
   // Return Value             : Max target size for Intra frames represented as
   //                            percentage of the per frame bandwidth
   uint32_t MaxIntraTarget(uint32_t optimal_buffer_size);
 
   EncodedImage encoded_image_;
   EncodedImageCallback* encoded_complete_callback_;
   VideoCodec codec_;
   bool inited_;
   int64_t timestamp_;
   uint16_t picture_id_;
   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.
+  uint8_t number_of_temporal_layers_;
+  uint8_t number_of_spatial_layers_;

[stefan-webrtc, 2015/07/09 14:48:59]

num_temporal_layers_
num_spatial_layers_

[åsapersson, 2015/07/29 12:10:12]

Done.

 };
 
 
 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_