Chromium Code Reviews| Index: webrtc/modules/video_coding/codecs/vp9/vp9_impl.h |
| diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h |
| index 5775952d60c9a76ae7519d5f63d693e3962a3ca7..0514715a698260dfa704ef0ffb8129c7cb112e55 100644 |
| --- a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h |
| +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.h |
| @@ -15,6 +15,7 @@ |
| #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" |
| @@ -55,7 +56,14 @@ class VP9EncoderImpl : public VP9Encoder { |
| 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?
å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 |
| // |
| @@ -76,6 +84,13 @@ class VP9EncoderImpl : public VP9Encoder { |
| 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.
|
| }; |