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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/vp8_impl.h

Issue 2833493003: Don't re-randomize picture_id/tl0_pic_idx when re-initializing internal encoders. (Closed)
Patch Set: asapersson comments 1: increment timestamp and push more frames through. Created 3 years, 7 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 * WEBRTC VP8 wrapper interface 10 * WEBRTC VP8 wrapper interface
11 */ 11 */
12 12
13 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ 13 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_
14 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ 14 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_
15 15
16 #include <memory> 16 #include <memory>
17 #include <vector> 17 #include <vector>
18 18
19 // NOTE: This include order must remain to avoid compile errors, even though 19 // NOTE: This include order must remain to avoid compile errors, even though
20 // it breaks the style guide. 20 // it breaks the style guide.
21 #include "vpx/vpx_encoder.h" 21 #include "vpx/vpx_encoder.h"
22 #include "vpx/vpx_decoder.h" 22 #include "vpx/vpx_decoder.h"
23 #include "vpx/vp8cx.h" 23 #include "vpx/vp8cx.h"
24 #include "vpx/vp8dx.h" 24 #include "vpx/vp8dx.h"
25 25
26 #include "webrtc/api/video/video_frame.h" 26 #include "webrtc/api/video/video_frame.h"
27 #include "webrtc/common_video/include/i420_buffer_pool.h" 27 #include "webrtc/common_video/include/i420_buffer_pool.h"
28 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
28 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 29 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
29 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
30 #include "webrtc/modules/video_coding/utility/quality_scaler.h" 30 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
31 #include "webrtc/video_frame.h" 31 #include "webrtc/video_frame.h"
32 32
33 namespace webrtc { 33 namespace webrtc {
34 34
35 class TemporalLayers; 35 class TemporalLayers;
36 36
37 class VP8EncoderImpl : public VP8Encoder { 37 class VP8EncoderImpl : public VP8Encoder {
38 public: 38 public:
39 VP8EncoderImpl(); 39 VP8EncoderImpl();
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 const bool use_gf_boost_; 93 const bool use_gf_boost_;
94 94
95 EncodedImageCallback* encoded_complete_callback_; 95 EncodedImageCallback* encoded_complete_callback_;
96 VideoCodec codec_; 96 VideoCodec codec_;
97 bool inited_; 97 bool inited_;
98 int64_t timestamp_; 98 int64_t timestamp_;
99 int qp_max_; 99 int qp_max_;
100 int cpu_speed_default_; 100 int cpu_speed_default_;
101 int number_of_cores_; 101 int number_of_cores_;
102 uint32_t rc_max_intra_target_; 102 uint32_t rc_max_intra_target_;
103 std::vector<TemporalLayers*> temporal_layers_; 103 std::vector<std::unique_ptr<TemporalLayers>> temporal_layers_;
104 std::vector<uint16_t> picture_id_; 104 std::vector<uint16_t> picture_id_;
105 std::vector<uint8_t> tl0_pic_idx_;
105 std::vector<int> last_key_frame_picture_id_; 106 std::vector<int> last_key_frame_picture_id_;
106 std::vector<bool> key_frame_request_; 107 std::vector<bool> key_frame_request_;
107 std::vector<bool> send_stream_; 108 std::vector<bool> send_stream_;
108 std::vector<int> cpu_speed_; 109 std::vector<int> cpu_speed_;
109 std::vector<vpx_image_t> raw_images_; 110 std::vector<vpx_image_t> raw_images_;
110 std::vector<EncodedImage> encoded_images_; 111 std::vector<EncodedImage> encoded_images_;
111 std::vector<vpx_codec_ctx_t> encoders_; 112 std::vector<vpx_codec_ctx_t> encoders_;
112 std::vector<vpx_codec_enc_cfg_t> configurations_; 113 std::vector<vpx_codec_enc_cfg_t> configurations_;
113 std::vector<vpx_rational_t> downsampling_factors_; 114 std::vector<vpx_rational_t> downsampling_factors_;
114 }; 115 };
(...skipping 30 matching lines...) Expand all
145 bool inited_; 146 bool inited_;
146 vpx_codec_ctx_t* decoder_; 147 vpx_codec_ctx_t* decoder_;
147 int propagation_cnt_; 148 int propagation_cnt_;
148 int last_frame_width_; 149 int last_frame_width_;
149 int last_frame_height_; 150 int last_frame_height_;
150 bool key_frame_required_; 151 bool key_frame_required_;
151 }; 152 };
152 } // namespace webrtc 153 } // namespace webrtc
153 154
154 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ 155 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698