ba050a6d6d
Reason for revert: Create reland CL to add fix to. Original issue's description: > Revert of Add a flags field to video timing extension. (patchset #15 id:280001 of https://codereview.webrtc.org/3000753002/ ) > > Reason for revert: > Speculative revet for breaking remoting_unittests in fyi bots. > https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Win7%20Tester > > Original issue's description: > > Add a flags field to video timing extension. > > > > The rtp header extension for video timing shuold have an additional > > field for signaling metadata, such as what triggered the extension for > > this particular frame. This will allow separating frames select because > > of outlier sizes from regular frames, for more accurate stats. > > > > This implementation is backwards compatible in that it can read video > > timing extensions without the new flag field, but it always sends with > > it included. > > > > BUG=webrtc:7594 > > > > Review-Url: https://codereview.webrtc.org/3000753002 > > Cr-Commit-Position: refs/heads/master@{#19353} > > Committed:cf5d485e14> > TBR=danilchap@webrtc.org,kthelgason@webrtc.org,stefan@webrtc.org,sprang@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7594 > > Review-Url: https://codereview.webrtc.org/2995953002 > Cr-Commit-Position: refs/heads/master@{#19360} > Committed:f0f7378b05TBR=danilchap@webrtc.org,kthelgason@webrtc.org,stefan@webrtc.org,emircan@google.com # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7594 Review-Url: https://codereview.webrtc.org/2996153002 Cr-Commit-Position: refs/heads/master@{#19405}
84 lines
3.0 KiB
C++
84 lines
3.0 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_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_
|
|
#define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_
|
|
|
|
// TODO(nisse): This header file should eventually be deleted. The
|
|
// EncodedImage class stays in this file until we have figured out how
|
|
// to refactor and clean up related interfaces, at which point it
|
|
// should be moved to somewhere under api/.
|
|
|
|
#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(uint8_t* buffer, size_t length, size_t size);
|
|
|
|
void SetEncodeTime(int64_t encode_start_ms, int64_t encode_finish_ms) const;
|
|
|
|
// 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};
|
|
|
|
// Timing information should be updatable on const instances.
|
|
mutable struct Timing {
|
|
uint8_t flags = TimingFrameFlags::kInvalid;
|
|
int64_t encode_start_ms = 0;
|
|
int64_t encode_finish_ms = 0;
|
|
int64_t packetization_finish_ms = 0;
|
|
int64_t pacer_exit_ms = 0;
|
|
int64_t network_timestamp_ms = 0;
|
|
int64_t network2_timestamp_ms = 0;
|
|
int64_t receive_start_ms = 0;
|
|
int64_t receive_finish_ms = 0;
|
|
} timing_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_
|