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}
62 lines
2.5 KiB
Plaintext
62 lines
2.5 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"
|
|
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
|
|
@implementation RTCRtpFragmentationHeader
|
|
|
|
@synthesize fragmentationOffset = _fragmentationOffset;
|
|
@synthesize fragmentationLength = _fragmentationLength;
|
|
@synthesize fragmentationTimeDiff = _fragmentationTimeDiff;
|
|
@synthesize fragmentationPlType = _fragmentationPlType;
|
|
|
|
- (instancetype)initWithFragmentationHeader:
|
|
(const webrtc::RTPFragmentationHeader *__nullable)fragmentationHeader {
|
|
if (self = [super init]) {
|
|
if (fragmentationHeader) {
|
|
int count = fragmentationHeader->fragmentationVectorSize;
|
|
NSMutableArray *offsets = [NSMutableArray array];
|
|
NSMutableArray *lengths = [NSMutableArray array];
|
|
NSMutableArray *timeDiffs = [NSMutableArray array];
|
|
NSMutableArray *plTypes = [NSMutableArray array];
|
|
for (int i = 0; i < count; ++i) {
|
|
[offsets addObject:@(fragmentationHeader->fragmentationOffset[i])];
|
|
[lengths addObject:@(fragmentationHeader->fragmentationLength[i])];
|
|
[timeDiffs addObject:@(fragmentationHeader->fragmentationTimeDiff[i])];
|
|
[plTypes addObject:@(fragmentationHeader->fragmentationPlType[i])];
|
|
}
|
|
_fragmentationOffset = [offsets copy];
|
|
_fragmentationLength = [lengths copy];
|
|
_fragmentationTimeDiff = [timeDiffs copy];
|
|
_fragmentationPlType = [plTypes copy];
|
|
}
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (webrtc::RTPFragmentationHeader *)toCpp {
|
|
webrtc::RTPFragmentationHeader *fragmentationHeader = new webrtc::RTPFragmentationHeader;
|
|
fragmentationHeader->VerifyAndAllocateFragmentationHeader(_fragmentationOffset.count);
|
|
for (NSUInteger i = 0; i < _fragmentationOffset.count; ++i) {
|
|
fragmentationHeader->fragmentationOffset[i] = (size_t)_fragmentationOffset[i].unsignedIntValue;
|
|
fragmentationHeader->fragmentationLength[i] = (size_t)_fragmentationLength[i].unsignedIntValue;
|
|
fragmentationHeader->fragmentationTimeDiff[i] =
|
|
(uint16_t)_fragmentationOffset[i].unsignedIntValue;
|
|
fragmentationHeader->fragmentationPlType[i] = (uint8_t)_fragmentationOffset[i].unsignedIntValue;
|
|
}
|
|
|
|
return fragmentationHeader;
|
|
}
|
|
|
|
@end
|