Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

115 lines
3.5 KiB
Plaintext
Raw Normal View History

Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2979973002/ ) Reason for revert: Fix the broken build file Original issue's description: > Revert of Injectable Obj-C video codecs (patchset #3 id:400001 of https://codereview.webrtc.org/2981583002/ ) > > Reason for revert: > Breaks bots. Build file incorrect. > > Original issue's description: > > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2975963002/ ) > > > > 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: https://chromium.googlesource.com/external/webrtc/+/a0349c138db62c52435be84b6c837f5f4758e264 > > > > > > 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: https://chromium.googlesource.com/external/webrtc/+/1095ada7ad56fe29b7b2bbc560a8f6475a7978ce > > > > R=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} > > Committed: https://chromium.googlesource.com/external/webrtc/+/a5f1de1e6541de03f944bcbf49be87c01f57a18b > > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,andersc@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/2979973002 > Cr-Commit-Position: refs/heads/master@{#19004} > Committed: https://chromium.googlesource.com/external/webrtc/+/81d40ee1491d5229c2677cc04b1f40d67c2babef TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,sprang@webrtc.org BUG=webrtc:7924 Review-Url: https://codereview.webrtc.org/2979983002 Cr-Commit-Position: refs/heads/master@{#19005}
2017-07-13 08:59:07 -07:00
/*
* 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"
#import "WebRTC/RTCVideoCodecFactory.h"
#include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h"
@implementation RTCVideoCodecInfo
@synthesize payload = _payload;
@synthesize name = _name;
@synthesize parameters = _parameters;
- (instancetype)initWithPayload:(int)payload
name:(NSString *)name
parameters:(NSDictionary<NSString *, NSString *> *)parameters {
if (self = [super init]) {
_payload = payload;
_name = name;
_parameters = parameters;
}
return self;
}
- (instancetype)initWithVideoCodec:(cricket::VideoCodec)videoCodec {
NSMutableDictionary *params = [NSMutableDictionary dictionary];
for (auto it = videoCodec.params.begin(); it != videoCodec.params.end(); ++it) {
[params setObject:webrtc::ios::NSStringFromStdString(it->second)
forKey:webrtc::ios::NSStringFromStdString(it->first)];
}
return [self initWithPayload:videoCodec.id
name:webrtc::ios::NSStringFromStdString(videoCodec.name)
parameters:params];
}
- (cricket::VideoCodec)toCpp {
cricket::VideoCodec codec(webrtc::ios::StdStringFromNSString(_name));
for (NSString *paramKey in [_parameters allKeys]) {
codec.SetParam(webrtc::ios::StdStringFromNSString(paramKey),
webrtc::ios::StdStringFromNSString(_parameters[paramKey]));
}
return codec;
}
@end
@implementation RTCVideoEncoderSettings
@synthesize name = _name;
@synthesize width = _width;
@synthesize height = _height;
@synthesize startBitrate = _startBitrate;
@synthesize maxBitrate = _maxBitrate;
@synthesize minBitrate = _minBitrate;
@synthesize targetBitrate = _targetBitrate;
@synthesize maxFramerate = _maxFramerate;
@synthesize qpMax = _qpMax;
- (instancetype)initWithVideoCodec:(const webrtc::VideoCodec *__nullable)videoCodec {
if (self = [super init]) {
if (videoCodec) {
rtc::Optional<const char *> codecName = CodecTypeToPayloadName(videoCodec->codecType);
if (codecName) {
_name = [NSString stringWithUTF8String:codecName.value()];
}
_width = videoCodec->width;
_height = videoCodec->height;
_startBitrate = videoCodec->startBitrate;
_maxBitrate = videoCodec->maxBitrate;
_minBitrate = videoCodec->minBitrate;
_targetBitrate = videoCodec->targetBitrate;
_maxFramerate = videoCodec->maxFramerate;
_qpMax = videoCodec->qpMax;
}
}
return self;
}
- (webrtc::VideoCodec *)toCpp {
webrtc::VideoCodec *codecSettings = new webrtc::VideoCodec;
rtc::Optional<webrtc::VideoCodecType> codecType =
webrtc::PayloadNameToCodecType(webrtc::ios::StdStringFromNSString(_name));
if (codecType) {
codecSettings->codecType = codecType.value();
}
codecSettings->width = _width;
codecSettings->height = _height;
codecSettings->startBitrate = _startBitrate;
codecSettings->maxBitrate = _maxBitrate;
codecSettings->minBitrate = _minBitrate;
codecSettings->targetBitrate = _targetBitrate;
codecSettings->maxFramerate = _maxFramerate;
codecSettings->qpMax = _qpMax;
return codecSettings;
}
@end