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}
82 lines
3.1 KiB
Plaintext
82 lines
3.1 KiB
Plaintext
/*
|
|
* Copyright 2017 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.
|
|
*/
|
|
|
|
#import "WebRTC/RTCVideoCodec.h"
|
|
|
|
#import "RTCVideoCodec+Private.h"
|
|
|
|
@implementation RTCEncodedImage
|
|
|
|
@synthesize buffer = _buffer;
|
|
@synthesize encodedWidth = _encodedWidth;
|
|
@synthesize encodedHeight = _encodedHeight;
|
|
@synthesize timeStamp = _timeStamp;
|
|
@synthesize captureTimeMs = _captureTimeMs;
|
|
@synthesize ntpTimeMs = _ntpTimeMs;
|
|
@synthesize flags = _flags;
|
|
@synthesize encodeStartMs = _encodeStartMs;
|
|
@synthesize encodeFinishMs = _encodeFinishMs;
|
|
@synthesize frameType = _frameType;
|
|
@synthesize rotation = _rotation;
|
|
@synthesize completeFrame = _completeFrame;
|
|
@synthesize qp = _qp;
|
|
@synthesize contentType = _contentType;
|
|
|
|
- (instancetype)initWithNativeEncodedImage:(webrtc::EncodedImage)encodedImage {
|
|
if (self = [super init]) {
|
|
// Wrap the buffer in NSData without copying, do not take ownership.
|
|
_buffer = [NSData dataWithBytesNoCopy:encodedImage._buffer
|
|
length:encodedImage._length
|
|
freeWhenDone:NO];
|
|
_encodedWidth = encodedImage._encodedWidth;
|
|
_encodedHeight = encodedImage._encodedHeight;
|
|
_timeStamp = encodedImage._timeStamp;
|
|
_captureTimeMs = encodedImage.capture_time_ms_;
|
|
_ntpTimeMs = encodedImage.ntp_time_ms_;
|
|
_flags = encodedImage.timing_.flags;
|
|
_encodeStartMs = encodedImage.timing_.encode_start_ms;
|
|
_encodeFinishMs = encodedImage.timing_.encode_finish_ms;
|
|
_frameType = (RTCFrameType)encodedImage._frameType;
|
|
_rotation = encodedImage.rotation_;
|
|
_completeFrame = encodedImage._completeFrame;
|
|
_qp = encodedImage.qp_ == -1 ? nil : @(encodedImage.qp_);
|
|
_contentType = (encodedImage.content_type_ == webrtc::VideoContentType::SCREENSHARE) ?
|
|
RTCVideoContentTypeScreenshare :
|
|
RTCVideoContentTypeUnspecified;
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (webrtc::EncodedImage)nativeEncodedImage {
|
|
// Return the pointer without copying.
|
|
webrtc::EncodedImage encodedImage(
|
|
(uint8_t *)_buffer.bytes, (size_t)_buffer.length, (size_t)_buffer.length);
|
|
encodedImage._encodedWidth = _encodedWidth;
|
|
encodedImage._encodedHeight = _encodedHeight;
|
|
encodedImage._timeStamp = _timeStamp;
|
|
encodedImage.capture_time_ms_ = _captureTimeMs;
|
|
encodedImage.ntp_time_ms_ = _ntpTimeMs;
|
|
encodedImage.timing_.flags = _flags;
|
|
encodedImage.timing_.encode_start_ms = _encodeStartMs;
|
|
encodedImage.timing_.encode_finish_ms = _encodeFinishMs;
|
|
encodedImage._frameType = webrtc::FrameType(_frameType);
|
|
encodedImage.rotation_ = webrtc::VideoRotation(_rotation);
|
|
encodedImage._completeFrame = _completeFrame;
|
|
encodedImage.qp_ = _qp ? _qp.intValue : -1;
|
|
encodedImage.content_type_ = (_contentType == RTCVideoContentTypeScreenshare) ?
|
|
webrtc::VideoContentType::SCREENSHARE :
|
|
webrtc::VideoContentType::UNSPECIFIED;
|
|
|
|
return encodedImage;
|
|
}
|
|
|
|
@end
|