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

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

Issue 1606613003: Remove extra_options from VideoCodec. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: compile Created 4 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
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 */
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 void PopulateStreamCodec(const webrtc::VideoCodec* inst, 103 void PopulateStreamCodec(const webrtc::VideoCodec* inst,
104 int stream_index, 104 int stream_index,
105 size_t total_number_of_streams, 105 size_t total_number_of_streams,
106 bool highest_resolution_stream, 106 bool highest_resolution_stream,
107 webrtc::VideoCodec* stream_codec, 107 webrtc::VideoCodec* stream_codec,
108 bool* send_stream); 108 bool* send_stream);
109 109
110 bool Initialized() const; 110 bool Initialized() const;
111 111
112 rtc::scoped_ptr<VideoEncoderFactory> factory_; 112 rtc::scoped_ptr<VideoEncoderFactory> factory_;
113 rtc::scoped_ptr<Config> screensharing_extra_options_; 113 rtc::scoped_ptr<TemporalLayersFactory> screensharing_tl_factory_;
114 VideoCodec codec_; 114 VideoCodec codec_;
115 std::vector<StreamInfo> streaminfos_; 115 std::vector<StreamInfo> streaminfos_;
116 EncodedImageCallback* encoded_complete_callback_; 116 EncodedImageCallback* encoded_complete_callback_;
117 }; 117 };
118 118
119 } // namespace webrtc 119 } // namespace webrtc
120 120
121 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_ 121 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698