| OLD | NEW |
| 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_INCLUDE_VIDEO_CODEC_INTERFACE_H_ |
| 12 #define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ | 12 #define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ |
| 13 | 13 |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "webrtc/common_types.h" | 16 #include "webrtc/common_types.h" |
| 17 #include "webrtc/modules/include/module_common_types.h" | 17 #include "webrtc/modules/include/module_common_types.h" |
| 18 #include "webrtc/modules/video_coding/include/video_error_codes.h" | 18 #include "webrtc/modules/video_coding/include/video_error_codes.h" |
| 19 #include "webrtc/typedefs.h" | 19 #include "webrtc/typedefs.h" |
| 20 #include "webrtc/video_decoder.h" | 20 #include "webrtc/video_decoder.h" |
| 21 #include "webrtc/video_encoder.h" | 21 #include "webrtc/video_encoder.h" |
| 22 #include "webrtc/video_frame.h" | 22 #include "webrtc/video_frame.h" |
| 23 | 23 |
| 24 namespace webrtc | 24 namespace webrtc { |
| 25 { | |
| 26 | 25 |
| 27 class RTPFragmentationHeader; // forward declaration | 26 class RTPFragmentationHeader; // forward declaration |
| 28 | 27 |
| 29 // Note: if any pointers are added to this struct, it must be fitted | 28 // Note: if any pointers are added to this struct, it must be fitted |
| 30 // with a copy-constructor. See below. | 29 // with a copy-constructor. See below. |
| 31 struct CodecSpecificInfoVP8 { | 30 struct CodecSpecificInfoVP8 { |
| 32 bool hasReceivedSLI; | 31 bool hasReceivedSLI; |
| 33 uint8_t pictureIdSLI; | 32 uint8_t pictureIdSLI; |
| 34 bool hasReceivedRPSI; | 33 bool hasReceivedRPSI; |
| 35 uint64_t pictureIdRPSI; | 34 uint64_t pictureIdRPSI; |
| 36 int16_t pictureId; // Negative value to skip pictureId. | 35 int16_t pictureId; // Negative value to skip pictureId. |
| 37 bool nonReference; | 36 bool nonReference; |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 union CodecSpecificInfoUnion { | 82 union CodecSpecificInfoUnion { |
| 84 CodecSpecificInfoGeneric generic; | 83 CodecSpecificInfoGeneric generic; |
| 85 CodecSpecificInfoVP8 VP8; | 84 CodecSpecificInfoVP8 VP8; |
| 86 CodecSpecificInfoVP9 VP9; | 85 CodecSpecificInfoVP9 VP9; |
| 87 CodecSpecificInfoH264 H264; | 86 CodecSpecificInfoH264 H264; |
| 88 }; | 87 }; |
| 89 | 88 |
| 90 // Note: if any pointers are added to this struct or its sub-structs, it | 89 // Note: if any pointers are added to this struct or its sub-structs, it |
| 91 // must be fitted with a copy-constructor. This is because it is copied | 90 // must be fitted with a copy-constructor. This is because it is copied |
| 92 // in the copy-constructor of VCMEncodedFrame. | 91 // in the copy-constructor of VCMEncodedFrame. |
| 93 struct CodecSpecificInfo | 92 struct CodecSpecificInfo { |
| 94 { | 93 VideoCodecType codecType; |
| 95 VideoCodecType codecType; | 94 CodecSpecificInfoUnion codecSpecific; |
| 96 CodecSpecificInfoUnion codecSpecific; | |
| 97 }; | 95 }; |
| 98 | 96 |
| 99 } // namespace webrtc | 97 } // namespace webrtc |
| 100 | 98 |
| 101 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ | 99 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ |
| OLD | NEW |