909338b027
This reverts commit 5faf36ef3c582350fba5ef97a3549e440d81a283. Reason for revert: fast/peerconnection/RTCRtpSender-setParameters.html failing in webrtc roll, probably this CL? https://chromium-review.googlesource.com/c/chromium/src/+/1045889. Original change's description: > Implement RtpParameters.transaction_id for PC RtpSenderInterface > > The transaction_id field should be refreshed for every getParameters() > call and checked at each setParameters() call. > This also checks that getParameters() was ever called to return a proper > error code. > > Bug: webrtc:7580 > Change-Id: I6c6fe289542e486fc422cdc61577982b0529d4c1 > Reviewed-on: https://webrtc-review.googlesource.com/70820 > Commit-Queue: Florent Castelli <orphis@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > Reviewed-by: Kári Helgason <kthelgason@webrtc.org> > Reviewed-by: Steve Anton <steveanton@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23120} TBR=steveanton@webrtc.org,deadbeef@webrtc.org,sakal@webrtc.org,kthelgason@webrtc.org,orphis@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:7580 Change-Id: I86da108227f8fc8d235bb2e9559377c800595b8c Reviewed-on: https://webrtc-review.googlesource.com/74740 Reviewed-by: Max Morin <maxmorin@webrtc.org> Commit-Queue: Max Morin <maxmorin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23134}
57 lines
1.7 KiB
Plaintext
57 lines
1.7 KiB
Plaintext
/*
|
|
* Copyright 2016 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 "RTCRtpParameters+Private.h"
|
|
|
|
#import "RTCRtpCodecParameters+Private.h"
|
|
#import "RTCRtpEncodingParameters+Private.h"
|
|
|
|
@implementation RTCRtpParameters
|
|
|
|
@synthesize encodings = _encodings;
|
|
@synthesize codecs = _codecs;
|
|
|
|
- (instancetype)init {
|
|
return [super init];
|
|
}
|
|
|
|
- (instancetype)initWithNativeParameters:
|
|
(const webrtc::RtpParameters &)nativeParameters {
|
|
if (self = [self init]) {
|
|
NSMutableArray *encodings = [[NSMutableArray alloc] init];
|
|
for (const auto &encoding : nativeParameters.encodings) {
|
|
[encodings addObject:[[RTCRtpEncodingParameters alloc]
|
|
initWithNativeParameters:encoding]];
|
|
}
|
|
_encodings = encodings;
|
|
|
|
NSMutableArray *codecs = [[NSMutableArray alloc] init];
|
|
for (const auto &codec : nativeParameters.codecs) {
|
|
[codecs addObject:[[RTCRtpCodecParameters alloc]
|
|
initWithNativeParameters:codec]];
|
|
}
|
|
_codecs = codecs;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (webrtc::RtpParameters)nativeParameters {
|
|
webrtc::RtpParameters parameters;
|
|
for (RTCRtpEncodingParameters *encoding in _encodings) {
|
|
parameters.encodings.push_back(encoding.nativeParameters);
|
|
}
|
|
for (RTCRtpCodecParameters *codec in _codecs) {
|
|
parameters.codecs.push_back(codec.nativeParameters);
|
|
}
|
|
return parameters;
|
|
}
|
|
|
|
@end
|