| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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_VIDEO_FRAME_H_ | 11 #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ |
| 12 #define WEBRTC_VIDEO_FRAME_H_ | 12 #define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ |
| 13 | 13 |
| 14 // TODO(nisse): This header file should eventually be deleted. For | 14 // TODO(nisse): This header file should eventually be deleted. The |
| 15 // declarations of classes related to unencoded video frame, use the | 15 // EncodedImage class stays in this file until we have figured out how |
| 16 // headers under api/video instead. The EncodedImage class stays in | 16 // to refactor and clean up related interfaces, at which point it |
| 17 // this file until we have figured out how to refactor and clean up | 17 // should be moved to somewhere under api/. |
| 18 // related interfaces. | |
| 19 | 18 |
| 20 #include "webrtc/common_types.h" | 19 #include "webrtc/common_types.h" |
| 21 #include "webrtc/typedefs.h" | 20 #include "webrtc/typedefs.h" |
| 22 | 21 |
| 23 namespace webrtc { | 22 namespace webrtc { |
| 24 | 23 |
| 25 // TODO(pbos): Rename EncodedFrame and reformat this class' members. | 24 // TODO(pbos): Rename EncodedFrame and reformat this class' members. |
| 26 class EncodedImage { | 25 class EncodedImage { |
| 27 public: | 26 public: |
| 28 static const size_t kBufferPaddingBytesH264; | 27 static const size_t kBufferPaddingBytesH264; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 AdaptReason adapt_reason_; | 59 AdaptReason adapt_reason_; |
| 61 int qp_ = -1; // Quantizer value. | 60 int qp_ = -1; // Quantizer value. |
| 62 | 61 |
| 63 // When an application indicates non-zero values here, it is taken as an | 62 // When an application indicates non-zero values here, it is taken as an |
| 64 // indication that all future frames will be constrained with those limits | 63 // indication that all future frames will be constrained with those limits |
| 65 // until the application indicates a change again. | 64 // until the application indicates a change again. |
| 66 PlayoutDelay playout_delay_ = {-1, -1}; | 65 PlayoutDelay playout_delay_ = {-1, -1}; |
| 67 }; | 66 }; |
| 68 | 67 |
| 69 } // namespace webrtc | 68 } // namespace webrtc |
| 70 #endif // WEBRTC_VIDEO_FRAME_H_ | 69 |
| 70 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ |
| OLD | NEW |