Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Side by Side Diff: webrtc/modules/video_coding/codecs/vp9/vp9_impl.h

Issue 2654633002: Remove svc_context.h include (Closed)
Patch Set: remove mistaken misdirection Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 * 9 *
10 */ 10 */
11 11
12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ 12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_
13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ 13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_
14 14
15 #include <memory> 15 #include <memory>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" 18 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
19 #include "webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h" 19 #include "webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h"
20 20
21 #include "vpx/svc_context.h" 21 #include "vpx/vp8cx.h"
22 #include "vpx/vpx_decoder.h" 22 #include "vpx/vpx_decoder.h"
23 #include "vpx/vpx_encoder.h" 23 #include "vpx/vpx_encoder.h"
24 24
25 namespace webrtc { 25 namespace webrtc {
26 26
27 class ScreenshareLayersVP9; 27 class ScreenshareLayersVP9;
28 28
29 class VP9EncoderImpl : public VP9Encoder { 29 class VP9EncoderImpl : public VP9Encoder {
30 public: 30 public:
31 VP9EncoderImpl(); 31 VP9EncoderImpl();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 EncodedImageCallback* encoded_complete_callback_; 106 EncodedImageCallback* encoded_complete_callback_;
107 VideoCodec codec_; 107 VideoCodec codec_;
108 bool inited_; 108 bool inited_;
109 int64_t timestamp_; 109 int64_t timestamp_;
110 uint16_t picture_id_; 110 uint16_t picture_id_;
111 int cpu_speed_; 111 int cpu_speed_;
112 uint32_t rc_max_intra_target_; 112 uint32_t rc_max_intra_target_;
113 vpx_codec_ctx_t* encoder_; 113 vpx_codec_ctx_t* encoder_;
114 vpx_codec_enc_cfg_t* config_; 114 vpx_codec_enc_cfg_t* config_;
115 vpx_image_t* raw_; 115 vpx_image_t* raw_;
116 SvcInternal_t svc_internal_; 116 vpx_svc_extra_cfg_t svc_params_;
117 const VideoFrame* input_image_; 117 const VideoFrame* input_image_;
118 GofInfoVP9 gof_; // Contains each frame's temporal information for 118 GofInfoVP9 gof_; // Contains each frame's temporal information for
119 // non-flexible mode. 119 // non-flexible mode.
120 uint8_t tl0_pic_idx_; // Only used in non-flexible mode. 120 uint8_t tl0_pic_idx_; // Only used in non-flexible mode.
121 size_t frames_since_kf_; 121 size_t frames_since_kf_;
122 uint8_t num_temporal_layers_; 122 uint8_t num_temporal_layers_;
123 uint8_t num_spatial_layers_; 123 uint8_t num_spatial_layers_;
124 124
125 // Used for flexible mode. 125 // Used for flexible mode.
126 bool is_flexible_mode_; 126 bool is_flexible_mode_;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 Vp9FrameBufferPool frame_buffer_pool_; 160 Vp9FrameBufferPool frame_buffer_pool_;
161 DecodedImageCallback* decode_complete_callback_; 161 DecodedImageCallback* decode_complete_callback_;
162 bool inited_; 162 bool inited_;
163 vpx_codec_ctx_t* decoder_; 163 vpx_codec_ctx_t* decoder_;
164 VideoCodec codec_; 164 VideoCodec codec_;
165 bool key_frame_required_; 165 bool key_frame_required_;
166 }; 166 };
167 } // namespace webrtc 167 } // namespace webrtc
168 168
169 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ 169 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698