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

Side by Side Diff: webrtc/video_engine/vie_encoder.h

Issue 1425613004: Remove VIDEOCODEC_* from engine_configurations.h. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove comment part Created 5 years, 1 month 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 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 void SetNetworkTransmissionState(bool is_transmitting); 74 void SetNetworkTransmissionState(bool is_transmitting);
75 75
76 // Returns the id of the owning channel. 76 // Returns the id of the owning channel.
77 int Owner() const; 77 int Owner() const;
78 78
79 // Drops incoming packets before they get to the encoder. 79 // Drops incoming packets before they get to the encoder.
80 void Pause(); 80 void Pause();
81 void Restart(); 81 void Restart();
82 82
83 // Codec settings. 83 // Codec settings.
84 uint8_t NumberOfCodecs();
85 int32_t GetCodec(uint8_t list_index, VideoCodec* video_codec);
86 int32_t RegisterExternalEncoder(VideoEncoder* encoder, 84 int32_t RegisterExternalEncoder(VideoEncoder* encoder,
87 uint8_t pl_type, 85 uint8_t pl_type,
88 bool internal_source); 86 bool internal_source);
89 int32_t DeRegisterExternalEncoder(uint8_t pl_type); 87 int32_t DeRegisterExternalEncoder(uint8_t pl_type);
90 int32_t SetEncoder(const VideoCodec& video_codec); 88 int32_t SetEncoder(const VideoCodec& video_codec);
91 89
92 // Scale or crop/pad image. 90 // Scale or crop/pad image.
93 int32_t ScaleInputImage(bool enable); 91 int32_t ScaleInputImage(bool enable);
94 92
95 // Implementing VideoCaptureCallback. 93 // Implementing VideoCaptureCallback.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 bool has_received_rpsi_ GUARDED_BY(data_cs_); 188 bool has_received_rpsi_ GUARDED_BY(data_cs_);
191 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); 189 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
192 std::map<uint32_t, int> ssrc_streams_ GUARDED_BY(data_cs_); 190 std::map<uint32_t, int> ssrc_streams_ GUARDED_BY(data_cs_);
193 191
194 bool video_suspended_ GUARDED_BY(data_cs_); 192 bool video_suspended_ GUARDED_BY(data_cs_);
195 }; 193 };
196 194
197 } // namespace webrtc 195 } // namespace webrtc
198 196
199 #endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ 197 #endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698