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

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

Issue 1721353002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
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 <vector> 16 #include <vector>
16 17
17 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" 18 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
18 #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"
19 20
20 #include "vpx/svc_context.h" 21 #include "vpx/svc_context.h"
21 #include "vpx/vpx_decoder.h" 22 #include "vpx/vpx_decoder.h"
22 #include "vpx/vpx_encoder.h" 23 #include "vpx/vpx_encoder.h"
23 24
24 namespace webrtc { 25 namespace webrtc {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 size_t frames_since_kf_; 122 size_t frames_since_kf_;
122 uint8_t num_temporal_layers_; 123 uint8_t num_temporal_layers_;
123 uint8_t num_spatial_layers_; 124 uint8_t num_spatial_layers_;
124 125
125 // Used for flexible mode. 126 // Used for flexible mode.
126 bool is_flexible_mode_; 127 bool is_flexible_mode_;
127 int64_t buffer_updated_at_frame_[kNumVp9Buffers]; 128 int64_t buffer_updated_at_frame_[kNumVp9Buffers];
128 int64_t frames_encoded_; 129 int64_t frames_encoded_;
129 uint8_t num_ref_pics_[kMaxVp9NumberOfSpatialLayers]; 130 uint8_t num_ref_pics_[kMaxVp9NumberOfSpatialLayers];
130 uint8_t p_diff_[kMaxVp9NumberOfSpatialLayers][kMaxVp9RefPics]; 131 uint8_t p_diff_[kMaxVp9NumberOfSpatialLayers][kMaxVp9RefPics];
131 rtc::scoped_ptr<ScreenshareLayersVP9> spatial_layer_; 132 std::unique_ptr<ScreenshareLayersVP9> spatial_layer_;
132 }; 133 };
133 134
134 class VP9DecoderImpl : public VP9Decoder { 135 class VP9DecoderImpl : public VP9Decoder {
135 public: 136 public:
136 VP9DecoderImpl(); 137 VP9DecoderImpl();
137 138
138 virtual ~VP9DecoderImpl(); 139 virtual ~VP9DecoderImpl();
139 140
140 int InitDecode(const VideoCodec* inst, int number_of_cores) override; 141 int InitDecode(const VideoCodec* inst, int number_of_cores) override;
141 142
(...skipping 16 matching lines...) Expand all
158 Vp9FrameBufferPool frame_buffer_pool_; 159 Vp9FrameBufferPool frame_buffer_pool_;
159 DecodedImageCallback* decode_complete_callback_; 160 DecodedImageCallback* decode_complete_callback_;
160 bool inited_; 161 bool inited_;
161 vpx_codec_ctx_t* decoder_; 162 vpx_codec_ctx_t* decoder_;
162 VideoCodec codec_; 163 VideoCodec codec_;
163 bool key_frame_required_; 164 bool key_frame_required_;
164 }; 165 };
165 } // namespace webrtc 166 } // namespace webrtc
166 167
167 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ 168 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/vp9/screenshare_layers_unittest.cc ('k') | webrtc/modules/video_coding/generic_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698