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

Side by Side Diff: webrtc/modules/video_coding/main/interface/video_coding_defines.h

Issue 1244753002: Remove kProtectionKey* and VCMKeyRequestMode. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 5 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 10
(...skipping 22 matching lines...) Expand all
33 #define VCM_JITTER_BUFFER_ERROR -9 33 #define VCM_JITTER_BUFFER_ERROR -9
34 #define VCM_OLD_PACKET_ERROR -10 34 #define VCM_OLD_PACKET_ERROR -10
35 #define VCM_NO_FRAME_DECODED -11 35 #define VCM_NO_FRAME_DECODED -11
36 #define VCM_ERROR_REQUEST_SLI -12 36 #define VCM_ERROR_REQUEST_SLI -12
37 #define VCM_NOT_IMPLEMENTED -20 37 #define VCM_NOT_IMPLEMENTED -20
38 38
39 enum { kDefaultStartBitrateKbps = 300 }; 39 enum { kDefaultStartBitrateKbps = 300 };
40 40
41 enum VCMVideoProtection { 41 enum VCMVideoProtection {
42 kProtectionNone, 42 kProtectionNone,
43 kProtectionNack, // Both send-side and receive-side 43 kProtectionNack,
44 kProtectionFEC, 44 kProtectionFEC,
45 kProtectionNackFEC, 45 kProtectionNackFEC,
46 kProtectionKeyOnLoss,
47 kProtectionKeyOnKeyLoss,
48 }; 46 };
49 47
50 enum VCMTemporalDecimation { 48 enum VCMTemporalDecimation {
51 kBitrateOverUseDecimation, 49 kBitrateOverUseDecimation,
52 }; 50 };
53 51
54 struct VCMFrameCount { 52 struct VCMFrameCount {
55 uint32_t numKeyFrames; 53 uint32_t numKeyFrames;
56 uint32_t numDeltaFrames; 54 uint32_t numDeltaFrames;
57 }; 55 };
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 virtual void RenderBufferSizeMs(int buffer_size_ms) = 0; 192 virtual void RenderBufferSizeMs(int buffer_size_ms) = 0;
195 193
196 protected: 194 protected:
197 virtual ~VCMRenderBufferSizeCallback() { 195 virtual ~VCMRenderBufferSizeCallback() {
198 } 196 }
199 }; 197 };
200 198
201 } // namespace webrtc 199 } // namespace webrtc
202 200
203 #endif // WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_ 201 #endif // WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698