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

Unified Diff: webrtc/modules/video_coding/codecs/vp8/vp8_impl.h

Issue 1913073002: Extract common simulcast logic from VP8 wrapper and simulcast adapter (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Bug fix Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/codecs/vp8/vp8_impl.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h
index 6906a322afcf7ffb45200611c02844167e489037..a10dbe44c2cb3061928a5c518c9302de6090e800 100644
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h
@@ -32,6 +32,7 @@
namespace webrtc {
+class SimulcastState;
class TemporalLayers;
class VP8EncoderImpl : public VP8Encoder {
@@ -86,9 +87,6 @@ class VP8EncoderImpl : public VP8Encoder {
int GetEncodedPartitions(const VideoFrame& input_image,
bool only_predicting_from_key_frame);
- // Set the stream state for stream |stream_idx|.
- void SetStreamState(bool send_stream, int stream_idx);
-
uint32_t MaxIntraTarget(uint32_t optimal_buffer_size);
EncodedImageCallback* encoded_complete_callback_;
@@ -102,14 +100,11 @@ class VP8EncoderImpl : public VP8Encoder {
int token_partitions_;
ReferencePictureSelection rps_;
std::vector<TemporalLayers*> temporal_layers_;
+ std::unique_ptr<SimulcastState> simulcast_state_;
pbos-webrtc 2016/04/29 21:23:27 stack allocate please
bool down_scale_requested_;
uint32_t down_scale_bitrate_;
- FrameDropper tl0_frame_dropper_;
- FrameDropper tl1_frame_dropper_;
std::vector<uint16_t> picture_id_;
std::vector<int> last_key_frame_picture_id_;
- std::vector<bool> key_frame_request_;
- std::vector<bool> send_stream_;
std::vector<int> cpu_speed_;
std::vector<vpx_image_t> raw_images_;
std::vector<EncodedImage> encoded_images_;

Powered by Google App Engine
This is Rietveld 408576698