mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +01:00
cebf50ff75
This is a reland of 5faf36ef3c
The issue in Chrome has been fixed and this should be safe to reland.
TBR=deadbeef
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}
Bug: webrtc:7580
Change-Id: Iabd41fb21afdf452c039d5513824ae334f8d1d3f
Reviewed-on: https://webrtc-review.googlesource.com/76980
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23247}
60 lines
1.9 KiB
Text
60 lines
1.9 KiB
Text
/*
|
|
* 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 "NSString+StdString.h"
|
|
#import "RTCRtpCodecParameters+Private.h"
|
|
#import "RTCRtpEncodingParameters+Private.h"
|
|
|
|
@implementation RTCRtpParameters
|
|
|
|
@synthesize transactionId = _transactionId;
|
|
@synthesize encodings = _encodings;
|
|
@synthesize codecs = _codecs;
|
|
|
|
- (instancetype)init {
|
|
return [super init];
|
|
}
|
|
|
|
- (instancetype)initWithNativeParameters:
|
|
(const webrtc::RtpParameters &)nativeParameters {
|
|
if (self = [self init]) {
|
|
_transactionId = [NSString stringForStdString:nativeParameters.transaction_id];
|
|
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;
|
|
parameters.transaction_id = [NSString stdStringForString:_transactionId];
|
|
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
|