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

Side by Side Diff: webrtc/video_send_stream.h

Issue 1263663005: Pass the encoder's internal source property through to video_sender to request a keyframe from the e (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 4 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 struct Config { 66 struct Config {
67 std::string ToString() const; 67 std::string ToString() const;
68 68
69 struct EncoderSettings { 69 struct EncoderSettings {
70 std::string ToString() const; 70 std::string ToString() const;
71 71
72 std::string payload_name; 72 std::string payload_name;
73 int payload_type = -1; 73 int payload_type = -1;
74 74
75 // TODO(sophiechang): Delete this field when no one is using internal
76 // sources anymore.
77 bool internal_source = false;
78
75 // Uninitialized VideoEncoder instance to be used for encoding. Will be 79 // Uninitialized VideoEncoder instance to be used for encoding. Will be
76 // initialized from inside the VideoSendStream. 80 // initialized from inside the VideoSendStream.
77 VideoEncoder* encoder = nullptr; 81 VideoEncoder* encoder = nullptr;
78 } encoder_settings; 82 } encoder_settings;
79 83
80 static const size_t kDefaultMaxPacketSize = 1500 - 40; // TCP over IPv4. 84 static const size_t kDefaultMaxPacketSize = 1500 - 40; // TCP over IPv4.
81 struct Rtp { 85 struct Rtp {
82 std::string ToString() const; 86 std::string ToString() const;
83 87
84 std::vector<uint32_t> ssrcs; 88 std::vector<uint32_t> ssrcs;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // in the config. Encoder settings are passed on to the encoder instance along 149 // in the config. Encoder settings are passed on to the encoder instance along
146 // with the VideoStream settings. 150 // with the VideoStream settings.
147 virtual bool ReconfigureVideoEncoder(const VideoEncoderConfig& config) = 0; 151 virtual bool ReconfigureVideoEncoder(const VideoEncoderConfig& config) = 0;
148 152
149 virtual Stats GetStats() = 0; 153 virtual Stats GetStats() = 0;
150 }; 154 };
151 155
152 } // namespace webrtc 156 } // namespace webrtc
153 157
154 #endif // WEBRTC_VIDEO_SEND_STREAM_H_ 158 #endif // WEBRTC_VIDEO_SEND_STREAM_H_
OLDNEW
« webrtc/video/video_send_stream.cc ('K') | « webrtc/video/video_send_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698