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

Side by Side Diff: webrtc/modules/video_coding/codecs/interface/video_codec_interface.h

Issue 1541803002: Lint fix for webrtc/modules/video_coding PART 1! (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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
11 #ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_
12 #define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ 12 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_
13 13
14 #pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; use video _coding/include") 14 #pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; "
15 15 "use video_coding/include")
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/common_types.h" 18 #include "webrtc/common_types.h"
19 #include "webrtc/modules/include/module_common_types.h" 19 #include "webrtc/modules/include/module_common_types.h"
20 #include "webrtc/modules/video_coding/include/video_error_codes.h" 20 #include "webrtc/modules/video_coding/include/video_error_codes.h"
21 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
22 #include "webrtc/video_decoder.h" 22 #include "webrtc/video_decoder.h"
23 #include "webrtc/video_encoder.h" 23 #include "webrtc/video_encoder.h"
24 #include "webrtc/video_frame.h" 24 #include "webrtc/video_frame.h"
25 25
26 namespace webrtc 26 namespace webrtc {
27 {
28 27
29 class RTPFragmentationHeader; // forward declaration 28 class RTPFragmentationHeader; // forward declaration
30 29
31 // Note: if any pointers are added to this struct, it must be fitted 30 // Note: if any pointers are added to this struct, it must be fitted
32 // with a copy-constructor. See below. 31 // with a copy-constructor. See below.
33 struct CodecSpecificInfoVP8 { 32 struct CodecSpecificInfoVP8 {
34 bool hasReceivedSLI; 33 bool hasReceivedSLI;
35 uint8_t pictureIdSLI; 34 uint8_t pictureIdSLI;
36 bool hasReceivedRPSI; 35 bool hasReceivedRPSI;
37 uint64_t pictureIdRPSI; 36 uint64_t pictureIdRPSI;
38 int16_t pictureId; // Negative value to skip pictureId. 37 int16_t pictureId; // Negative value to skip pictureId.
39 bool nonReference; 38 bool nonReference;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 union CodecSpecificInfoUnion { 84 union CodecSpecificInfoUnion {
86 CodecSpecificInfoGeneric generic; 85 CodecSpecificInfoGeneric generic;
87 CodecSpecificInfoVP8 VP8; 86 CodecSpecificInfoVP8 VP8;
88 CodecSpecificInfoVP9 VP9; 87 CodecSpecificInfoVP9 VP9;
89 CodecSpecificInfoH264 H264; 88 CodecSpecificInfoH264 H264;
90 }; 89 };
91 90
92 // Note: if any pointers are added to this struct or its sub-structs, it 91 // Note: if any pointers are added to this struct or its sub-structs, it
93 // must be fitted with a copy-constructor. This is because it is copied 92 // must be fitted with a copy-constructor. This is because it is copied
94 // in the copy-constructor of VCMEncodedFrame. 93 // in the copy-constructor of VCMEncodedFrame.
95 struct CodecSpecificInfo 94 struct CodecSpecificInfo {
96 { 95 VideoCodecType codecType;
97 VideoCodecType codecType; 96 CodecSpecificInfoUnion codecSpecific;
98 CodecSpecificInfoUnion codecSpecific;
99 }; 97 };
100 98
101 } // namespace webrtc 99 } // namespace webrtc
102 100
103 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ 101 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698