27c46e2872
Reason for revert: Breaks android buildbots. Original issue's description: > Reland of Add content type information to encoded images and corresponding rtp extension header (patchset #1 id:1 of https://codereview.webrtc.org/2816463002/ ) > > Reason for revert: > Reland with appropriate changes to API to not break depending projects. > > Original issue's description: > > Revert of Add content type information to encoded images and corresponding rtp extension header (patchset #31 id:600001 of https://codereview.webrtc.org/2772033002/ ) > > > > Reason for revert: > > Breaks dependent projects. > > > > Original issue's description: > > > Add content type information to Encoded Images and add corresponding RTP extension header. > > > Use it to separate UMA e2e delay metric between screenshare from video. > > > Content type extension is set based on encoder settings and processed and decoders. > > > > > > Also, > > > Fix full-stack-tests to calculate RTT correctly, so new metric could be tested. > > > > > > BUG=webrtc:7420 > > > > > > Review-Url: https://codereview.webrtc.org/2772033002 > > > Cr-Commit-Position: refs/heads/master@{#17640} > > > Committed:64e739aeae> > > > TBR=tommi@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,nisse@webrtc.org,mflodman@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:7420 > > > > Review-Url: https://codereview.webrtc.org/2816463002 > > Cr-Commit-Position: refs/heads/master@{#17644} > > Committed:5721866808> > TBR=tommi@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,nisse@webrtc.org,mflodman@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7420 > > Review-Url: https://codereview.webrtc.org/2812913002 > Cr-Commit-Position: refs/heads/master@{#17651} > Committed:774f6b4b96TBR=tommi@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,nisse@webrtc.org,mflodman@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7420 Review-Url: https://codereview.webrtc.org/2809653004 Cr-Commit-Position: refs/heads/master@{#17653}
72 lines
2.6 KiB
C++
72 lines
2.6 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#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.
|
|
|
|
#include "webrtc/api/video/video_frame.h"
|
|
#include "webrtc/api/video/i420_buffer.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/typedefs.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;
|
|
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_
|