| Index: webrtc/video_frame.h
|
| diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h
|
| index 93cc1713679c4084638874b62a194780ada6f383..76975e8d1bb90b0e47d1d1ea5ead60097f210fa4 100644
|
| --- a/webrtc/video_frame.h
|
| +++ b/webrtc/video_frame.h
|
| @@ -11,60 +11,9 @@
|
| #ifndef WEBRTC_VIDEO_FRAME_H_
|
| #define WEBRTC_VIDEO_FRAME_H_
|
|
|
| -// TODO(nisse): This header file should eventually be deleted. For
|
| -// declarations of classes related to unencoded video frame, use the
|
| -// headers under api/video instead. The EncodedImage class stays in
|
| -// this file until we have figured out how to refactor and clean up
|
| -// related interfaces.
|
| +// TODO(nisse): Delete this wrapper file, as soon as downstream
|
| +// projects are updated.
|
|
|
| -#include "webrtc/common_types.h"
|
| -#include "webrtc/typedefs.h"
|
| +#include "webrtc/common_video/include/video_frame.h"
|
|
|
| -namespace webrtc {
|
| -
|
| -// TODO(pbos): Rename EncodedFrame and reformat this class' members.
|
| -class EncodedImage {
|
| - public:
|
| - static const size_t kBufferPaddingBytesH264;
|
| -
|
| - // Some decoders require encoded image buffers to be padded with a small
|
| - // number of additional bytes (due to over-reading byte readers).
|
| - static size_t GetBufferPaddingBytes(VideoCodecType codec_type);
|
| -
|
| - EncodedImage() : EncodedImage(nullptr, 0, 0) {}
|
| -
|
| - EncodedImage(uint8_t* buffer, size_t length, size_t size)
|
| - : _buffer(buffer), _length(length), _size(size) {}
|
| -
|
| - // TODO(kthelgason): get rid of this struct as it only has a single member
|
| - // remaining.
|
| - struct AdaptReason {
|
| - AdaptReason() : bw_resolutions_disabled(-1) {}
|
| - int bw_resolutions_disabled; // Number of resolutions that are not sent
|
| - // due to bandwidth for this frame.
|
| - // Or -1 if information is not provided.
|
| - };
|
| - uint32_t _encodedWidth = 0;
|
| - uint32_t _encodedHeight = 0;
|
| - uint32_t _timeStamp = 0;
|
| - // NTP time of the capture time in local timebase in milliseconds.
|
| - int64_t ntp_time_ms_ = 0;
|
| - int64_t capture_time_ms_ = 0;
|
| - FrameType _frameType = kVideoFrameDelta;
|
| - uint8_t* _buffer;
|
| - size_t _length;
|
| - size_t _size;
|
| - VideoRotation rotation_ = kVideoRotation_0;
|
| - VideoContentType content_type_ = VideoContentType::UNSPECIFIED;
|
| - bool _completeFrame = false;
|
| - AdaptReason adapt_reason_;
|
| - int qp_ = -1; // Quantizer value.
|
| -
|
| - // When an application indicates non-zero values here, it is taken as an
|
| - // indication that all future frames will be constrained with those limits
|
| - // until the application indicates a change again.
|
| - PlayoutDelay playout_delay_ = {-1, -1};
|
| -};
|
| -
|
| -} // namespace webrtc
|
| #endif // WEBRTC_VIDEO_FRAME_H_
|
|
|