a5f1de1e65
Reason for revert: New CL for fixing the issues Original issue's description: > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ ) > > Reason for revert: > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future. > > Original issue's description: > > Injectable Obj-C video codecs > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264 > > (wrapping the VideoToolbox codec). > > > > Some notes / things left to do: > > - There are some hard-coded references to codec types that are supported by > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder. > > These types would need to be more codec agnostic to avoid this. > > - Most interfaces are borrowed from the design document for injectable > > codecs in Android. Some data in the corresponding C++ classes is discarded > > when converting to the Obj-C version, since it has fewer fields. I have not > > verified whether all data that we do keep is needed, or whether we might be > > losing anything useful in these conversions. > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264 > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder. > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/ > > Decoder wrapper classes. > > - List the injected codec factory's supported codecs in the list of codecs in > > AppRTCMobile. > > > > BUG=webrtc:7924 > > R=magjed@webrtc.org > > > > Review-Url: https://codereview.webrtc.org/2966023002 . > > Cr-Commit-Position: refs/heads/master@{#18928} > > Committed:a0349c138d> > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7924 > NOTRY=true > > Review-Url: https://codereview.webrtc.org/2975963002 > Cr-Commit-Position: refs/heads/master@{#18979} > Committed:1095ada7adR=magjed@webrtc.org TBR=tkchin@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7924 Review-Url: https://codereview.webrtc.org/2981583002 . Cr-Commit-Position: refs/heads/master@{#19002}
75 lines
2.8 KiB
Plaintext
75 lines
2.8 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 isTimingFrame = _isTimingFrame;
|
|
@synthesize encodeStartMs = _encodeStartMs;
|
|
@synthesize encodeFinishMs = _encodeFinishMs;
|
|
@synthesize frameType = _frameType;
|
|
@synthesize rotation = _rotation;
|
|
@synthesize completeFrame = _completeFrame;
|
|
@synthesize qp = _qp;
|
|
|
|
- (instancetype)initWithEncodedImage:(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_;
|
|
_isTimingFrame = encodedImage.timing_.is_timing_frame;
|
|
_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_);
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (webrtc::EncodedImage)toCpp {
|
|
// 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_.is_timing_frame = _isTimingFrame;
|
|
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;
|
|
|
|
return encodedImage;
|
|
}
|
|
|
|
@end
|